[Pkg-mozext-commits] [tabmixplus] 32/44: Let Classic theme restorer control close tab button placement

[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 324eff5f65b9a42e5dab17d281cc70174cae14b8
Author: onemen <tabmix.onemen at gmail.com>
Date:   Wed Oct 8 11:56:25 2014 +0300

    Let Classic theme restorer control close tab button placement
---
 chrome/content/extensions/extensions.js | 11 ++++++++++-
 chrome/content/tab/tab.js               | 12 ++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/chrome/content/extensions/extensions.js b/chrome/content/extensions/extensions.js
index a389af4..ae1934d 100644
--- a/chrome/content/extensions/extensions.js
+++ b/chrome/content/extensions/extensions.js
@@ -20,7 +20,16 @@ var TMP_extensionsCompatibility = {
   onContentLoaded: function TMP_EC_onContentLoaded() {
     Tabmix.extensions = {treeStyleTab: false, tabGroupManager: false,
         verticalTabBar: false, ieTab2: false,
-        gIeTab: false /* for ieTab and ieTab2 */};
+        gIeTab: false, /* for ieTab and ieTab2 */
+        ctr: false /* classic theme restorer */};
+
+    if (typeof classicthemerestorerjs == "object") {
+      Tabmix.extensions.ctr = true;
+      let onLeft = Tabmix.prefs.getBoolPref("tabs.closeButtons.onLeft");
+      Services.prefs.setBoolPref("extensions.classicthemerestorer.closeonleft", onLeft);
+      // let Classic theme restorer control close tab button placement
+      gBrowser.tabContainer.setAttribute("closebuttons-side", "right");
+    }
 
     // sessionManager extension is restartless since version 0.8
     Tabmix.extensions.__defineGetter__("sessionManager", function() {
diff --git a/chrome/content/tab/tab.js b/chrome/content/tab/tab.js
index ecb7960..18e682e 100644
--- a/chrome/content/tab/tab.js
+++ b/chrome/content/tab/tab.js
@@ -571,6 +571,7 @@ var gTMPprefObserver = {
     addObserver("layout.css.devPixelsPerPx", TabmixSvc.australis);
     addObserver("browser.tabs.onTop", !Tabmix.isVersion(290));
     addObserver("browser.tabs.closeButtons", !Tabmix.isVersion(310));
+    addObserver("extensions.classicthemerestorer.closeonleft", Tabmix.extensions.ctr);
 
     try {
       // add Observer
@@ -780,6 +781,17 @@ var gTMPprefObserver = {
         }
         break;
       case "extensions.tabmix.tabs.closeButtons.onLeft":
+      case "extensions.classicthemerestorer.closeonleft":
+        if (Tabmix.extensions.ctr) {
+          let otherPref = prefName == "extensions.tabmix.tabs.closeButtons.onLeft" ?
+                                      "extensions.classicthemerestorer.closeonleft" :
+                                      "extensions.tabmix.tabs.closeButtons.onLeft"
+          value = Services.prefs.getBoolPref(prefName);
+          if (Services.prefs.getBoolPref(otherPref) != value)
+            Services.prefs.setBoolPref(otherPref, Services.prefs.getBoolPref(prefName));
+          Tabmix.setItem(gBrowser.tabContainer, "closebuttons-side", "right");
+          break;
+        }
         let onLeft = Tabmix.defaultCloseButtons && Services.prefs.getBoolPref(prefName);
         gBrowser.tabContainer.setAttribute("closebuttons-side", onLeft ? "left" : "right");
         break;

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