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

Render messages light blue until finished sending // Fixes #219

Browse source
This commit is contained in:
lilia 2015-05-26 13:30:51 -07:00
parent 405e67c758
commit 3e39271220
5 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
js/models/conversations.js
View file

@ -75,7 +75,8 @@
type : 'outgoing',
attachments : attachments,
sent_at : now,
received_at : now
received_at : now,
pending : true
});
message.save();
@ -95,7 +96,10 @@
else {
sendFunc = textsecure.messaging.sendMessageToGroup;
}
sendFunc(this.get('id'), body, attachments, now).catch(function(errors) {
sendFunc(this.get('id'), body, attachments, now).then(function() {
message.unset('pending');
message.save();
}.bind(this)).catch(function(errors) {
var keyErrors = [];
_.each(errors, function(e) {
if (e.error.name === 'OutgoingIdentityKeyError') {

7
js/views/message_view.js
View file

@ -23,6 +23,7 @@
initialize: function() {
this.listenTo(this.model, 'change:body change:errors', this.render);
this.listenTo(this.model, 'change:delivered', this.renderDelivered);
this.listenTo(this.model, 'change', this.renderPending);
this.listenTo(this.model, 'change:flags change:group_update', this.renderControl);
this.listenTo(this.model, 'destroy', this.remove);
},
@ -35,6 +36,11 @@
className: function() {
return ["entry", this.model.get('type')].join(' ');
},
renderPending: function() {
if (this.model.isOutgoing()) {
this.$el.toggleClass('pending', !!this.model.get('pending'));
}
},
renderDelivered: function() {
if (this.model.get('delivered')) { this.$el.addClass('delivered'); }
},
@ -66,6 +72,7 @@
content.html(this.autoLink(content.html()));
this.renderDelivered();
this.renderPending();
this.renderControl();
this.$('.attachments').append(