colin/Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix menu behavior

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

// FREEBIE
This commit is contained in:
lilia
2016-03-22 11:01:36 -07:00
parent 2e7c7ce0cc
commit 08da29969c
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
js/views/conversation_view.js
View File

@@ -96,7 +96,8 @@
'loadMore .message-list': 'fetchMessages', 'loadMore .message-list': 'fetchMessages',
'focus .send-message': 'focusBottomBar', 'focus .send-message': 'focusBottomBar',
'blur .send-message': 'unfocusBottomBar', 'blur .send-message': 'unfocusBottomBar',
'click .back': 'resetPanel' 'click .back': 'resetPanel',
'close .menu': 'closeMenu'
}, },
unfocusBottomBar: function() { unfocusBottomBar: function() {

1
js/views/inbox_view.js
View File

@@ -125,6 +125,7 @@
focusHeader: function() { focusHeader: function() {
this.$('.conversation-stack').addClass('inactive'); this.$('.conversation-stack').addClass('inactive');
this.$('#header').removeClass('inactive'); this.$('#header').removeClass('inactive');
this.$('.conversation:first .menu').trigger('close');
}, },
reloadBackgroundPage: function() { reloadBackgroundPage: function() {
chrome.runtime.reload(); chrome.runtime.reload();