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

Don't display notifications for open windows.

Browse Source 
Just update and draw attention to them.

Fixes #238

// FREEBIE
This commit is contained in:
lilia
2015-05-24 16:19:33 -07:00
parent d8f17f9631
commit 3eafefe18e
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
js/panel_controller.js
View File

@@ -48,7 +48,13 @@
};
window.notifyConversation = function(message) {
if (Whisper.Notifications.isEnabled()) {
var conversationId = message.get('conversationId');
var windowId = windowMap.windowIdFrom(conversationId);
if (windowId) {
// already open
updateConversation(conversationId);
extension.windows.drawAttention(windowId);
} else if (Whisper.Notifications.isEnabled()) {
var conversation = getConversation({id: message.get('conversationId')});
var sender = getConversation({id: message.get('source')});
conversation.fetch().then(function() {
@@ -65,7 +71,6 @@
});
conversation.fetchMessages();
} else {
var conversationId = message.get('conversationId');
openConversation(conversationId);
var windowId = windowMap.windowIdFrom(conversationId);
extension.windows.drawAttention(windowId);