[Pkg-mozext-commits] [tabmixplus] 06/32: Initialize our session manager after SessionStore.promiseInitialized resolved

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository tabmixplus.

commit 5d4250a4bfb71c4277cdc9b947b887db3e060a7b
Author: onemen <tabmix.onemen at gmail.com>
Date:   Mon Dec 28 12:11:32 2015 +0200

    Initialize our session manager after SessionStore.promiseInitialized resolved
---
 chrome/content/links/setup.js     |  8 ++------
 chrome/content/session/session.js | 16 ++++++----------
 chrome/content/tabmix.js          | 10 ++--------
 3 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/chrome/content/links/setup.js b/chrome/content/links/setup.js
index 2405bb0..f3e8b74 100644
--- a/chrome/content/links/setup.js
+++ b/chrome/content/links/setup.js
@@ -153,11 +153,7 @@ Tabmix.beforeBrowserInitOnLoad = function() {
       fn = "gBrowserInit._delayedStartup";
     }
 
-    let insertionPoint, ssPromise = "";
-    insertionPoint = "PlacesToolbarHelper.init();";
-    if (!this.isVersion(270))
-      ssPromise = 'typeof ssPromise == "object" ? ssPromise : null';
-
+    let insertionPoint = "PlacesToolbarHelper.init();";
     this.changeCode(gBrowserInit, fn)._replace(
       '{',
       '{\n' +
@@ -167,7 +163,7 @@ Tabmix.beforeBrowserInitOnLoad = function() {
     )._replace(
       insertionPoint,
       'try {' +
-      '  Tabmix.beforeSessionStoreInit(' + ssPromise + ');' +
+      '  Tabmix.beforeSessionStoreInit();' +
       '} catch (ex) {Tabmix.assert(ex);}\n' +
       '    $&'
     )._replace(
diff --git a/chrome/content/session/session.js b/chrome/content/session/session.js
index cc9133c..6934404 100644
--- a/chrome/content/session/session.js
+++ b/chrome/content/session/session.js
@@ -257,26 +257,22 @@ var TabmixSessionManager = { // jshint ignore:line
   },
 
   // call by Tabmix.beforeSessionStoreInit
-  init: function SM_init(aPromise) {
+  init: function SM_init() {
     if (this._inited)
       return;
     this._inited = true;
 
     let initializeSM = function() {
-      TabmixSvc.sm.promiseInitialized = true;
       this._init();
       if (this.notifyObservers)
         this._sendRestoreCompletedNotifications(false);
     }.bind(this);
 
-    if (Tabmix.isVersion(250, 250) && !TabmixSvc.sm.promiseInitialized) {
-      Tabmix.ssPromise = aPromise || TabmixSvc.ss.promiseInitialized;
-      Tabmix.ssPromise.then(() => TMP_TabView.init())
-                      .then(initializeSM)
-                      .then(null, Tabmix.reportError);
-    } else {
-      initializeSM();
-    }
+    TabmixSvc.ss.promiseInitialized
+      .then(() => TMP_TabView.init())
+      .then(initializeSM)
+      .then(() => Tabmix.sessionInitialized())
+      .then(null, Tabmix.reportError);
   },
 
   _init: function SM__init() {
diff --git a/chrome/content/tabmix.js b/chrome/content/tabmix.js
index fba2c77..858e0c5 100644
--- a/chrome/content/tabmix.js
+++ b/chrome/content/tabmix.js
@@ -42,7 +42,7 @@ Tabmix.startup = function TMP_startup() {
 };
 
 // we call this function from gBrowserInit._delayedStartup, see setup.js
-Tabmix.beforeSessionStoreInit = function TMP_beforeSessionStoreInit(aPromise) {
+Tabmix.beforeSessionStoreInit = function TMP_beforeSessionStoreInit() {
   // when gBrowserInit._delayedStartup broke by extension we don't get
   // "browser-delayed-startup-finished" notification
   setTimeout(function() {
@@ -55,7 +55,7 @@ Tabmix.beforeSessionStoreInit = function TMP_beforeSessionStoreInit(aPromise) {
     TMP_SessionStore.setService(1, true);
   }
 
-  TabmixSessionManager.init(aPromise);
+  TabmixSessionManager.init();
 
   // if we call these functions earlier we get this warning:
   // XUL box for _moz_generated_content_before element contained an inline #text child
@@ -68,7 +68,6 @@ Tabmix.beforeSessionStoreInit = function TMP_beforeSessionStoreInit(aPromise) {
 
 // after TabmixSessionManager and SessionStore initialized
 Tabmix.sessionInitialized = function() {
-  this.ssPromise = null;
   var SM = TabmixSessionManager;
   if (SM.enableManager) {
     window.restoreLastSession = function restoreLastSession() {
@@ -180,11 +179,6 @@ Tabmix.delayedStartup = function TMP_delayedStartup() {
 
   TMP_TabView.init();
 
-  if (this.isVersion(250) && this.ssPromise && !TabmixSvc.sm.promiseInitialized)
-    this.ssPromise.then(this.sessionInitialized.bind(this), Tabmix.reportError);
-  else
-    this.sessionInitialized();
-
   // when we open bookmark in new window
   // get bookmark itemId and url - for use in getBookmarkTitle
   if ("bookMarkIds" in window) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/tabmixplus.git