[Pkg-mozext-commits] [tabmixplus] 37/56: Check for the existence of gBrowser.tabContainer._verticalTabs to identify if vertical-tabs-reloaded installed before VerticalTabsReloaded exist

[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 d198a0f0378f0cef9b805f8614ae58f9fcada006
Author: onemen <tabmix.onemen at gmail.com>
Date:   Mon May 16 14:43:41 2016 +0300

    Check for the existence of gBrowser.tabContainer._verticalTabs to identify if vertical-tabs-reloaded installed before VerticalTabsReloaded exist
---
 chrome/content/extensions/extensions.js |  1 +
 chrome/content/minit/tablib.js          | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/chrome/content/extensions/extensions.js b/chrome/content/extensions/extensions.js
index 909ef75..9cfd033 100644
--- a/chrome/content/extensions/extensions.js
+++ b/chrome/content/extensions/extensions.js
@@ -473,6 +473,7 @@ var TMP_extensionsCompatibility = {
     // https://addons.mozilla.org/en-US/firefox/addon/tabkit-2nd-edition/
     let isVertical = typeof VerticalTabs == "object" ||
         typeof VerticalTabsReloaded == "object" ||
+        typeof gBrowser.tabContainer._verticalTabs == "boolean" ||
         typeof sidetabs == "object" ||
         typeof tabkit == "object" ||
         typeof tabkitGlobal == "object";
diff --git a/chrome/content/minit/tablib.js b/chrome/content/minit/tablib.js
index 5dc20ca..be71383 100644
--- a/chrome/content/minit/tablib.js
+++ b/chrome/content/minit/tablib.js
@@ -368,13 +368,13 @@ var tablib = { // eslint-disable-line
 
   change_tabContainer: function change_tabContainer() {
     let tabBar = gBrowser.tabContainer;
-    Tabmix.changeCode(tabBar, "gBrowser.tabContainer.handleEvent")._replace(
-      'this.adjustTabstrip',
-      'TabmixTabbar._handleResize(); \
-       $&'
-    ).toCode();
-
     if (!Tabmix.extensions.verticalTabs) {
+      Tabmix.changeCode(tabBar, "gBrowser.tabContainer.handleEvent")._replace(
+        'this.adjustTabstrip',
+        'TabmixTabbar._handleResize(); \
+         $&'
+      ).toCode();
+
       let $LF = '\n          ';
       Tabmix.changeCode(tabBar, "gBrowser.tabContainer._positionPinnedTabs")._replace(
         'this.removeAttribute("positionpinnedtabs");',

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