[Pkg-mozext-commits] [tabmixplus] 42/73: Update incompatibility with Vertical Tabs Reloaded, reset initialization flag for Tabmix.initialization.run in the tabbarowser constructor

[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 c7a47e6c40c65e71e63260c2d8ccbf7fb34b91c7
Author: onemen <tabmix.onemen at gmail.com>
Date:   Sat Apr 16 13:47:27 2016 +0300

    Update incompatibility with Vertical Tabs Reloaded, reset initialization flag for Tabmix.initialization.run in the tabbarowser constructor
---
 chrome/content/extensions/extensions.js | 21 ++++++++++++---------
 chrome/content/tab/tab.js               |  6 +++---
 chrome/content/tab/tabbrowser_4.xml     |  1 +
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/chrome/content/extensions/extensions.js b/chrome/content/extensions/extensions.js
index f883d22..8497dc1 100644
--- a/chrome/content/extensions/extensions.js
+++ b/chrome/content/extensions/extensions.js
@@ -219,14 +219,7 @@ var TMP_extensionsCompatibility = {
   },
 
   onWindowOpen: function TMP_EC_onWindowOpen() {
-    // https://addons.mozilla.org/EN-US/firefox/addon/vertical-tabs/
-    // https://addons.mozilla.org/EN-US/firefox/addon/side-tabs/
-    // https://addons.mozilla.org/en-US/firefox/addon/tabkit-2nd-edition/
-    if (typeof VerticalTabs == "object" || typeof sidetabs == "object" ||
-        typeof tabkitGlobal == "object") {
-      Tabmix.extensions.verticalTabs = true;
-      Tabmix.extensions.verticalTabBar = true;
-    }
+    this.setVerticalTabs();
 
     // Look for RSS/Atom News Reader
     if ("gotoLink" in window)
@@ -471,8 +464,18 @@ var TMP_extensionsCompatibility = {
         '      $&'
       ).toCode();
     }
-  }
+  },
 
+  setVerticalTabs: function() {
+    // https://addons.mozilla.org/EN-US/firefox/addon/vertical-tabs/
+    // https://addons.mozilla.org/EN-US/firefox/addon/side-tabs/
+    // https://addons.mozilla.org/en-US/firefox/addon/tabkit-2nd-edition/
+    let isVertical = typeof VerticalTabs == "object" || typeof sidetabs == "object" ||
+        typeof tabkitGlobal == "object";
+    let treeStyleTab = typeof TreeStyleTabService == "object";
+    Tabmix.extensions.verticalTabBar = isVertical || treeStyleTab;
+    Tabmix.extensions.verticalTabs = isVertical && !treeStyleTab;
+  },
 };
 
 TMP_extensionsCompatibility.RSSTICKER = {
diff --git a/chrome/content/tab/tab.js b/chrome/content/tab/tab.js
index 2c61d3f..b2ee329 100644
--- a/chrome/content/tab/tab.js
+++ b/chrome/content/tab/tab.js
@@ -741,10 +741,10 @@ Tabmix.tabsUtils = {
   initializeTabmixUI: function() {
     // https://addons.mozilla.org/EN-US/firefox/addon/vertical-tabs/
     // verticalTabs 0.9.1+ is restartless.
-    if (typeof VerticalTabs == "object" && !Tabmix.extensions.verticalTabs) {
+    let isVertical = Tabmix.extensions.verticalTabs;
+    TMP_extensionsCompatibility.setVerticalTabs();
+    if (isVertical != Tabmix.extensions.verticalTabs) {
       Tabmix.setItem("TabsToolbar", "collapsed", null);
-      Tabmix.extensions.verticalTabs = true;
-      Tabmix.extensions.verticalTabBar = true;
       TabmixTabbar.updateSettings();
     }
 
diff --git a/chrome/content/tab/tabbrowser_4.xml b/chrome/content/tab/tabbrowser_4.xml
index 9152614..cba06d8 100644
--- a/chrome/content/tab/tabbrowser_4.xml
+++ b/chrome/content/tab/tabbrowser_4.xml
@@ -362,6 +362,7 @@
 
       <constructor>
         <![CDATA[
+          Tabmix.initialization.init.initialized = false;
           Tabmix.initialization.run("init", this);
         ]]>
       </constructor>

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