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

16
js/views/message_view.js
View file

@ -32,6 +32,10 @@
renderDelivered: function() {
if (this.model.get('delivered')) { this.$el.addClass('delivered'); }
},
renderErrors: function() {
var errors = this.model.get('errors');
if (_.size(errors) > 0) { this.$el.addClass('error'); }
},
renderControl: function() {
if (this.model.isEndSession() || this.model.isGroupUpdate()) {
this.$el.addClass('control');
@ -59,6 +63,7 @@
this.renderSent();
this.renderDelivered();
this.renderErrors();
this.renderControl();
this.$('.attachments').append(
@ -69,17 +74,6 @@
})
);
var errors = this.model.get('errors');
if (errors && errors.length) {
this.$('.bubble').prepend(
errors.map(function(error) {
return new Whisper.MessageErrorView({
model: error,
message: this.model
}).render().el;
}.bind(this))
);
}
return this;
}
});