From 08da29969cd92adbbee6809c67aa2e514b21a0d0 Mon Sep 17 00:00:00 2001
From: lilia <liliakai@gmail.com>
Date: Tue, 22 Mar 2016 11:01:36 -0700
Subject: [PATCH] Fix menu behavior

Opening the global menu should close the conversation menu and vice
versa.

// FREEBIE
---
 js/views/conversation_view.js | 3 ++-
 js/views/inbox_view.js        | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index a81c5da0b..7c1bc2cce 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -96,7 +96,8 @@
             'loadMore .message-list': 'fetchMessages',
             'focus .send-message': 'focusBottomBar',
             'blur .send-message': 'unfocusBottomBar',
-            'click .back': 'resetPanel'
+            'click .back': 'resetPanel',
+            'close .menu': 'closeMenu'
         },
 
         unfocusBottomBar: function() {
diff --git a/js/views/inbox_view.js b/js/views/inbox_view.js
index 5ebbed4a2..758111c8f 100644
--- a/js/views/inbox_view.js
+++ b/js/views/inbox_view.js
@@ -125,6 +125,7 @@
         focusHeader: function() {
             this.$('.conversation-stack').addClass('inactive');
             this.$('#header').removeClass('inactive');
+            this.$('.conversation:first .menu').trigger('close');
         },
         reloadBackgroundPage: function() {
             chrome.runtime.reload();