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

MessageView: Make Quotes resilient to re-renders

Browse source
This commit is contained in:
Scott Nonnenberg 2018-04-12 16:57:50 -07:00
parent b458c7d449
commit 0100e279f5
No known key found for this signature in database
GPG key ID: 5F82280C35134661
1 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
js/views/message_view.js
View file

@ -378,7 +378,7 @@
return null;
},
renderReply() {
renderQuote() {
const VOICE_FLAG = textsecure.protobuf.AttachmentPointer.Flags.VOICE_MESSAGE;
const objectUrl = this.getQuoteObjectUrl();
const quote = this.model.get('quote');
@ -426,18 +426,18 @@
text: quote.text,
};
if (!this.replyView) {
if (contact) {
this.listenTo(contact, 'change:color', this.renderReply);
}
this.replyView = new Whisper.ReactWrapperView({
el: this.$('.quote-wrapper'),
Component: window.Signal.Components.Quote,
props,
});
} else {
this.replyView.update(props);
if (this.replyView) {
this.replyView.remove();
this.replyView = null;
} else if (contact) {
this.listenTo(contact, 'change:color', this.renderQuote);
}
this.replyView = new Whisper.ReactWrapperView({
el: this.$('.quote-wrapper'),
Component: window.Signal.Components.Quote,
props,
});
},
isImageWithoutCaption() {
const attachments = this.model.get('attachments');
@ -486,8 +486,7 @@
this.renderRead();
this.renderErrors();
this.renderExpiring();
this.renderReply();
this.renderQuote();
// NOTE: We have to do this in the background (`then` instead of `await`)
// as our code / Backbone seems to rely on `render` synchronously returning