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

Quiet notifications if the window is open

Browse Source 
Draw attention to the window instead.

// FREEBIE
This commit is contained in:
lilia
2015-08-26 16:10:44 -07:00
parent 0b98043c1c
commit 39d13d5e45
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
js/panel_controller.js
View File

@@ -86,11 +86,10 @@
window.notifyConversation = function(message) { window.notifyConversation = function(message) {
var conversationId = message.get('conversationId'); var conversationId = message.get('conversationId');
var windowId = windowMap.windowIdFrom(conversationId); if (inboxOpened) {
if (windowId) {
// already open // already open
updateConversation(conversationId); updateConversation(conversationId);
extension.windows.drawAttention(windowId); extension.windows.drawAttention(inboxWindowId);
} else if (Whisper.Notifications.isEnabled()) { } else if (Whisper.Notifications.isEnabled()) {
var conversation = getConversation({id: message.get('conversationId')}); var conversation = getConversation({id: message.get('conversationId')});
var sender = getConversation({id: message.get('source')}); var sender = getConversation({id: message.get('source')});
@@ -109,6 +108,7 @@
conversation.fetchMessages(); conversation.fetchMessages();
} else { } else {
openConversation(conversationId); openConversation(conversationId);
openInbox();
extension.windows.drawAttention(windowId); extension.windows.drawAttention(windowId);
} }
}; };