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

Make MessageView::onUnload synchronous

Browse source 
Our tests rely on that.
This commit is contained in:
Daniel Gasienica 2018-03-20 18:20:01 -04:00
parent add5d4ab0b
commit ef2be2cf5f
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
js/views/message_view.js
View file

@ -231,7 +231,7 @@
setTimeout(this.remove.bind(this), 1000); setTimeout(this.remove.bind(this), 1000);
}, },
/* jshint ignore:start */ /* jshint ignore:start */
onUnload: async function() { onUnload: function() {
if (this.avatarView) { if (this.avatarView) {
this.avatarView.remove(); this.avatarView.remove();
} }
@ -248,8 +248,12 @@
this.timeStampView.remove(); this.timeStampView.remove();
} }
const views = await this.loadedAttachmentViews; // NOTE: We have to do this in the background (`then` instead of `await`)
views.forEach(view => view.unload()); // as our tests rely on `onUnload` synchronously removing the view from
// the DOM.
// eslint-disable-next-line more/no-then
this.loadAttachmentViews()
.then(views => views.forEach(view => view.unload()));
// No need to handle this one, since it listens to 'unload' itself: // No need to handle this one, since it listens to 'unload' itself:
// this.timerView // this.timerView