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

Consolidate message callbacks

Browse source 
Register the runtime callback at the top level view rather than having
each conversation view register independently.
Also refactors Layout into InboxView.
This commit is contained in:
lilia 2014-11-16 15:30:40 -08:00
parent 470346c9c4
commit c0681beca7
6 changed files with 99 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

25
js/models/conversations.js
View file

@ -59,12 +59,13 @@
sendMessage: function(message, attachments) {
return encodeAttachments(attachments).then(function(base64_attachments) {
var timestamp = Date.now();
this.messages().add({ body: message,
timestamp: timestamp,
conversationId: this.id,
conversationType: this.get('type'),
type: 'outgoing',
attachments: base64_attachments
this.messageCollection.add({
body : message,
timestamp : timestamp,
conversationId : this.id,
conversationType : this.get('type'),
type : 'outgoing',
attachments : base64_attachments
}).save();
this.save({ timestamp: timestamp,
@ -88,7 +89,7 @@
var conversation = this;
return encodeAttachments(decrypted.message.attachments).then(function(base64_attachments) {
var timestamp = decrypted.pushMessage.timestamp.toNumber();
var m = this.messages().add({
var m = this.messageCollection.add({
body: decrypted.message.body,
timestamp: timestamp,
conversationId: this.id,
@ -103,19 +104,15 @@
}
this.save({unreadCount: this.get('unreadCount') + 1, active: true});
return new Promise(function (resolve) { m.save().then(resolve) });
return new Promise(function (resolve) { m.save().then(resolve(m)) });
}.bind(this));
},
fetch: function(options) {
fetchMessages: function(options) {
options = options || {};
options.conditions = {conversationId: this.id };
return this.messageCollection.fetch(options);
},
messages: function() {
return this.messageCollection;
},
}
});
Whisper.ConversationCollection = Backbone.Collection.extend({