mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Move handlePushMessageContent to message model

Browse source 
And retool message handling flow to helps us avoid instantiating
duplicate message and conversation models.
This commit is contained in:
lilia 2015-03-18 16:26:55 -07:00
parent 897d391817
commit 9930937707
5 changed files with 98 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

13
js/panel_controller.js
View file

@ -41,15 +41,15 @@
windowMap.remove('windowId', windowId);
}
function getConversation(modelId) {
var conversation = window.inbox.get(modelId) || {id: modelId};
conversation = conversations.add(conversation);
window.getConversation = function(attrs) {
var conversation = window.inbox.get(attrs.id) || attrs;
conversation = conversations.add(attrs);
return conversation;
}
};
window.notifyConversation = function(message) {
if (Whisper.Notifications.isEnabled()) {
var conversation = getConversation(message.get('conversationId'));
var conversation = getConversation({id: message.get('conversationId')});
conversation.fetch().then(function() {
var notification = new Notification(conversation.getTitle(), {
body: message.get('body'),
@ -60,13 +60,14 @@
openConversation(conversation.id);
};
});
conversation.fetchMessages();
} else {
openConversation(message.get('conversationId'));
}
};
window.openConversation = function openConversation (modelId) {
var conversation = getConversation(modelId);
var conversation = getConversation({id: modelId});
conversation.fetch().then(function() {
conversation.fetchContacts();
});