From 2f144d24d9e9a9ef72fe418996e3c911b304b00a Mon Sep 17 00:00:00 2001
From: Daniel Gasienica <daniel@gasienica.ch>
Date: Tue, 27 Feb 2018 11:13:50 -0500
Subject: [PATCH] Remove existing global hamburger menu
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This will be replaced by a OS-level ‘Preferences’ menu.
---
 background.html        | 10 ----------
 js/views/inbox_view.js | 13 -------------
 test/index.html        | 10 ----------
 3 files changed, 33 deletions(-)

diff --git a/background.html b/background.html
index 6f92a1e5a1..388dd921b8 100644
--- a/background.html
+++ b/background.html
@@ -69,16 +69,6 @@
     <div class='gutter'>
         <div class='network-status-container'></div>
         <div class='title-bar active' id='header'>
-          <div class='header-buttons right'>
-            <div class='vertical-align'>
-              <div class='global-menu menu'>
-                <button class='hamburger' alt='signal menu'></button>
-                <ul class='menu-list'>
-                    <li class='showSettings'>{{ settings }}</li>
-                </ul>
-              </div>
-            </div>
-          </div>
           <h1>Signal</h1>
           <div class='tool-bar clearfix'>
             <input type='search' class='search' placeholder='{{ searchForPeopleOrGroups }}' dir='auto'>
diff --git a/js/views/inbox_view.js b/js/views/inbox_view.js
index 704474587c..1f65dce00d 100644
--- a/js/views/inbox_view.js
+++ b/js/views/inbox_view.js
@@ -170,8 +170,6 @@
       click: 'onClick',
       'click #header': 'focusHeader',
       'click .conversation': 'focusConversation',
-      'click .global-menu .hamburger': 'toggleMenu',
-      'click .showSettings': 'showSettings',
       'select .gutter .conversation-list-item': 'openConversation',
       'input input.search': 'filterContacts',
       'show .lightbox': 'showLightbox',
@@ -258,9 +256,6 @@
         this.focusConversation();
       }
     },
-    toggleMenu() {
-      this.$('.global-menu .menu-list').toggle();
-    },
     showLightbox(e) {
       this.$el.append(e.target);
     },
@@ -270,15 +265,7 @@
       }
       this.$('.conversation:first .recorder').trigger('close');
     },
-    closeMenu(e) {
-      if (e && this.$(e.target).parent('.global-menu').length > 0) {
-        return;
-      }
-
-      this.$('.global-menu .menu-list').hide();
-    },
     onClick(e) {
-      this.closeMenu(e);
       this.closeRecording(e);
     },
   });
diff --git a/test/index.html b/test/index.html
index d58c409517..52a3b74bfc 100644
--- a/test/index.html
+++ b/test/index.html
@@ -41,16 +41,6 @@
     <div class='gutter'>
         <div class='network-status-container'></div>
         <div class='title-bar active' id='header'>
-          <div class='header-buttons right'>
-            <div class='vertical-align'>
-              <div class='global-menu menu'>
-                <button class='hamburger' alt='signal menu'></button>
-                <ul class='menu-list'>
-                    <li class='showSettings'>{{ settings }}</li>
-                </ul>
-              </div>
-            </div>
-          </div>
           <h1>Signal</h1>
           <div class='tool-bar clearfix'>
             <input type='search' class='search' placeholder='{{ searchForPeopleOrGroups }}' dir='auto'>