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

Move identity conflicts to top of message detail

Browse source 
Also restyle them as with network errors

// FREEBIE
This commit is contained in:
lilia 2016-02-14 16:46:28 -08:00
parent b5058e3981
commit ad66da9fb5
5 changed files with 27 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
js/views/message_detail_view.js
View file

@ -101,7 +101,11 @@
conflict: conflict,
errors: this.errors[contact.id]
}).render();
this.$('.contacts').append(v.el);
if (conflict) {
this.$('.conflicts').append(v.el);
} else {
this.$('.contacts').append(v.el);
}
},
render: function() {
this.errors = _.groupBy(this.model.get('errors'), 'number');
@ -110,6 +114,10 @@
e.name === 'OutgoingMessageError' ||
e.name === 'SendMessageNetworkError');
});
var hasConflict = false;
if (this.model.hasKeyConflicts()) {
hasConflict = i18n('newIdentity');
}
this.$el.html(Mustache.render(_.result(this, 'template', ''), {
sent_at : moment(this.model.get('sent_at')).toString(),
received_at : this.model.isIncoming() ? moment(this.model.get('received_at')).toString() : null,
@ -121,7 +129,8 @@
resend : i18n('resend'),
failedToSend: i18n('failedToSend'),
errorLabel : i18n('error'),
hasRetry : hasRetry
hasRetry : hasRetry,
hasConflict : hasConflict
}));
this.view.$el.prependTo(this.$('.message-container'));