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

Move error messages to message detail view

Browse source 
Change how message errors are rendered. Errors associated with a number
will be shown under that number in the detail view rather than piling up
in the message bubble.

// FREEBIE
This commit is contained in:
lilia 2015-09-30 14:27:18 -07:00
parent 9a63703340
commit 929c16090b
6 changed files with 64 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

9
js/views/message_detail_view.js
View file

@ -10,6 +10,7 @@
templateName: 'contact-detail',
initialize: function(options) {
this.conflict = options.conflict;
this.errors = options.errors;
},
events: {
'click .conflict': 'triggerConflict'
@ -21,7 +22,8 @@
return {
name : this.model.getTitle(),
avatar : this.model.getAvatar(),
conflict : this.conflict
conflict : this.conflict,
errors : this.errors
};
}
});
@ -32,6 +34,7 @@
initialize: function(options) {
this.view = new Whisper.MessageView({model: this.model});
this.conversation = options.conversation;
this.errors = _.groupBy(this.model.get('errors'), 'number');
this.listenTo(this.model, 'change', this.render);
},
@ -79,7 +82,8 @@
renderContact: function(contact) {
var v = new ContactView({
model: contact,
conflict: this.model.getKeyConflict(contact.id)
conflict: this.model.getKeyConflict(contact.id),
errors: this.errors[contact.id]
}).render().$el.appendTo(this.$('.contacts'));
},
render: function() {
@ -87,6 +91,7 @@
sent_at : moment(this.model.get('sent_at')).toString(),
received_at : moment(this.model.get('received_at')).toString(),
tofrom : this.model.isIncoming() ? 'From' : 'To',
errors : this.errors['undefined']
}));
this.view.render().$el.prependTo(this.$('.message-container'));