[Pkg-mozext-commits] [tabmixplus] 44/56: Disable 'Place on left side' when treeStyleTab installed, 1. treeStyleTab have similar preference. 2. TreeStyleTabBrowser.prototype.initTabContentsOrderInternal throw last window reopen

[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 f264fdabcfe3712aeb2dfad7f1deea4bf104df2a
Author: onemen <tabmix.onemen at gmail.com>
Date:   Wed May 18 12:07:03 2016 +0300

    Disable 'Place on left side' when treeStyleTab installed, 1. treeStyleTab have similar preference. 2. TreeStyleTabBrowser.prototype.initTabContentsOrderInternal throw last window reopen
---
 chrome/content/extensions/extensions.js  | 36 --------------------------------
 chrome/content/preferences/appearance.js |  4 +++-
 2 files changed, 3 insertions(+), 37 deletions(-)

diff --git a/chrome/content/extensions/extensions.js b/chrome/content/extensions/extensions.js
index 9cfd033..92e094e 100644
--- a/chrome/content/extensions/extensions.js
+++ b/chrome/content/extensions/extensions.js
@@ -644,42 +644,6 @@ TMP_extensionsCompatibility.treeStyleTab = {
         return this.document.getAnonymousElementByAttribute(aTab, 'class', 'tab-close-button close-icon');
       };
 
-      fn = obj.initTabContentsOrderInternal;
-      if (fn.toString().indexOf("closebuttons-side") == -1) {
-        Tabmix.changeCode(obj, "TreeStyleTabBrowser.prototype.initTabContentsOrderInternal")._replace(
-          'if (this.mTabBrowser.getAttribute(this.kTAB_CONTENTS_INVERTED) == \'true\')',
-          'let button = aNamedNodes.close;\n    ' +
-          'index = nodes.indexOf(button);\n   ' +
-          'if (index > -1) {\n    ' +
-          ' let tabbar = this.mTabBrowser.tabContainer;\n   ' +
-          ' let side = tabbar.getAttribute("closebuttons-side");\n    ' +
-          ' if (side == "left") {\n   ' +
-          '   let before = nodes.indexOf(aNamedNodes.twistyAnchor);\n   ' +
-          '   if (before > -1) {\n    ' +
-          '     nodes.splice(index, 1);\n   ' +
-          '     let mOver = tabbar.mCloseButtons;\n   ' +
-          '     mOver = mOver == 4 && button.getAttribute("selected") != "true" || mOver == 2;\n    ' +
-          '     let offset = mOver ? 1 : 0;\n   ' +
-          '     nodes.splice(before + offset, 0, button);\n   ' +
-          '   }\n   ' +
-          ' }\n   ' +
-          '}\n\n    ' +
-          '$&'
-        )._replace(
-          'let key = \'initTabContentsOrderInternal_\'',
-          'let self = this;\n     ' +
-          '$&'
-        ).toCode();
-
-        let callback = function() {
-          TabmixSvc.forEachBrowserWindow(function(aWindow) {
-            aWindow.gBrowser.treeStyleTab.updateInvertedTabContentsOrder(true);
-          });
-        };
-        TabmixSvc.prefs.observe("extensions.tabmix.tabs.closeButtons", callback);
-        TabmixSvc.prefs.observe("extensions.tabmix.tabs.closeButtons.onLeft", callback);
-      }
-
       // update ordinal on previous selected tab when close tab button is on the
       // left side and CloseButtons preference is 4 - close buttons on hover
       // and active tabs
diff --git a/chrome/content/preferences/appearance.js b/chrome/content/preferences/appearance.js
index 9b3e82d..7227a10 100644
--- a/chrome/content/preferences/appearance.js
+++ b/chrome/content/preferences/appearance.js
@@ -21,7 +21,9 @@ var gAppearancePane = {
       Tabmix.setItem("squaredTabs", "hidden", true);
     }
 
-    Tabmix.setItem("tabXLeft", "disabled", !browserWindow.Tabmix.defaultCloseButtons || null);
+    let disableButtonOnLefSide = !browserWindow.Tabmix.defaultCloseButtons ||
+        browserWindow.Tabmix.extensions.treeStyleTab;
+    Tabmix.setItem("tabXLeft", "disabled", disableButtonOnLefSide || null);
     Tabmix.setItem("onLeftDisabled", "hidden", browserWindow.Tabmix.defaultCloseButtons || null);
 
     // browser.allTabs.previews

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