diff --git a/js/background.js b/js/background.js index 41e025f58..7212f5ffe 100644 --- a/js/background.js +++ b/js/background.js @@ -443,7 +443,11 @@ return ConversationController.updateInbox().then(function() { try { 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()); return self.inboxView; diff --git a/js/views/inbox_view.js b/js/views/inbox_view.js index baa540e4f..217886e78 100644 --- a/js/views/inbox_view.js +++ b/js/views/inbox_view.js @@ -80,6 +80,8 @@ .addClass(theme); }, initialize: function (options) { + options = options || {}; + this.ready = false; this.render(); this.applyTheme(); @@ -90,9 +92,11 @@ model: { window: options.window } }); - this.appLoadingScreen = new Whisper.AppLoadingScreen(); - this.appLoadingScreen.render(); - this.appLoadingScreen.$el.prependTo(this.el); + if (!options.initialLoadComplete) { + this.appLoadingScreen = new Whisper.AppLoadingScreen(); + this.appLoadingScreen.render(); + this.appLoadingScreen.$el.prependTo(this.el); + } var inboxCollection = getInboxCollection();