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

Handle the 'extension loaded, reopen window' scenario

Browse source 
Not sure exactly how to think about Chrome app lifetimes, so we're
being conservative. We only show the full-application loading screen
once, on first display of the inbox.

FREEBIE
This commit is contained in:
Scott Nonnenberg 2017-07-24 18:54:13 -07:00
parent 53f2bfbb57
commit 39795170c1
2 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
js/background.js
View file

@ -443,7 +443,11 @@
return ConversationController.updateInbox().then(function() { return ConversationController.updateInbox().then(function() {
try { try {
if (self.inboxView) { self.inboxView.remove(); } if (self.inboxView) { self.inboxView.remove(); }
self.inboxView = new Whisper.InboxView({model: self, window: destWindow}); self.inboxView = new Whisper.InboxView({
model: self,
window: destWindow,
initialLoadComplete: initialLoadComplete
});
self.openConversation(getOpenConversation()); self.openConversation(getOpenConversation());
return self.inboxView; return self.inboxView;

10
js/views/inbox_view.js
View file

@ -80,6 +80,8 @@
.addClass(theme); .addClass(theme);
}, },
initialize: function (options) { initialize: function (options) {
options = options || {};
this.ready = false; this.ready = false;
this.render(); this.render();
this.applyTheme(); this.applyTheme();
@ -90,9 +92,11 @@
model: { window: options.window } model: { window: options.window }
}); });
this.appLoadingScreen = new Whisper.AppLoadingScreen(); if (!options.initialLoadComplete) {
this.appLoadingScreen.render(); this.appLoadingScreen = new Whisper.AppLoadingScreen();
this.appLoadingScreen.$el.prependTo(this.el); this.appLoadingScreen.render();
this.appLoadingScreen.$el.prependTo(this.el);
}
var inboxCollection = getInboxCollection(); var inboxCollection = getInboxCollection();