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

Simplify event arguments

Browse source 
// FREEBIE
This commit is contained in:
lilia 2015-09-21 10:21:33 -07:00
parent c8a76ab38e
commit 4a482243d0
5 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
js/index.js
View file

@ -16,7 +16,7 @@
view.$el.prependTo(bg.$('body',document)); view.$el.prependTo(bg.$('body',document));
window.openConversation = function(conversation) { window.openConversation = function(conversation) {
if (conversation) { if (conversation) {
view.openConversation(null, {conversation: conversation}); view.openConversation(null, conversation);
} }
}; };
openConversation(bg.getOpenConversation()); openConversation(bg.getOpenConversation());

2
js/views/conversation_list_item_view.js
View file

@ -25,7 +25,7 @@
select: function(e) { select: function(e) {
this.$el.addClass('selected').siblings('.selected').removeClass('selected'); this.$el.addClass('selected').siblings('.selected').removeClass('selected');
this.$el.trigger('select', {conversation: this.model}); this.$el.trigger('select', this.model);
}, },
render: function() { render: function() {

3
js/views/inbox_view.js
View file

@ -111,8 +111,7 @@
'click .show-new-conversation': 'showCompose', 'click .show-new-conversation': 'showCompose',
'select .gutter .contact': 'openConversation' 'select .gutter .contact': 'openConversation'
}, },
openConversation: function(e, data) { openConversation: function(e, conversation) {
var conversation = data.conversation;
this.conversation_stack.open(conversation); this.conversation_stack.open(conversation);
this.hideCompose(); this.hideCompose();
}, },

4
js/views/new_conversation_view.js
View file

@ -84,7 +84,7 @@
var id = this.getRecipients().at(0).id; var id = this.getRecipients().at(0).id;
ConversationController.findOrCreatePrivateById(id).then(function(conversation) { ConversationController.findOrCreatePrivateById(id).then(function(conversation) {
conversation.save('active_at', Date.now()); conversation.save('active_at', Date.now());
this.trigger('open', { conversation: conversation }); this.trigger('open', conversation);
}.bind(this)); }.bind(this));
} }
}, },
@ -112,7 +112,7 @@
}; };
var group = ConversationController.create(attributes); var group = ConversationController.create(attributes);
group.save().then(function() { group.save().then(function() {
this.trigger('open', { conversation: group }); this.trigger('open', group);
}.bind(this)); }.bind(this));
var now = Date.now(); var now = Date.now();
var message = group.messageCollection.add({ var message = group.messageCollection.add({

6
js/views/recipients_input_view.js
View file

@ -136,14 +136,14 @@
}).render(); }).render();
}, },
addNewRecipient: function(e, data) { addNewRecipient: function() {
this.recipients.add(this.new_contact_view.model); this.recipients.add(this.new_contact_view.model);
this.initNewContact(); this.initNewContact();
this.resetTypeahead(); this.resetTypeahead();
}, },
addRecipient: function(e, data) { addRecipient: function(e, conversation) {
this.recipients.add(this.typeahead.remove(data.conversation.id)); this.recipients.add(this.typeahead.remove(conversation.id));
this.resetTypeahead(); this.resetTypeahead();
}, },