[Pkg-mozext-commits] [tabmixplus] 22/51: Move updateScrollButtons from gBrowser.tabContainer.mTabstrip to Tabmix.tabsUtils

Mon Feb 2 18:36:49 UTC 2015

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

taffit pushed a commit to branch master
in repository tabmixplus.

commit 21f6422ad69bda748318f6db5c81aabe217c0498
Author: onemen <tabmix.onemen at gmail.com>
Date:   Sat Jan 3 14:39:10 2015 +0200

    Move updateScrollButtons from gBrowser.tabContainer.mTabstrip to Tabmix.tabsUtils
---
 chrome/content/minit/minit.js    |  4 ++--
 chrome/content/tab/scrollbox.xml | 19 -------------------
 chrome/content/tab/tab.js        | 28 +++++++++++++++++++++++++++-
 3 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/chrome/content/minit/minit.js b/chrome/content/minit/minit.js
index 0745508..d4fb9e8 100644
--- a/chrome/content/minit/minit.js
+++ b/chrome/content/minit/minit.js
@@ -1305,7 +1305,7 @@ Tabmix.navToolbox = {
       next.parentNode.insertBefore(box, next);
       if (!onlyPosition) {
         let useTabmixButtons = TabmixTabbar.scrollButtonsMode > TabmixTabbar.SCROLL_BUTTONS_LEFT_RIGHT;
-        gBrowser.tabContainer.mTabstrip.updateScrollButtons(useTabmixButtons);
+        Tabmix.tabsUtils.updateScrollButtons(useTabmixButtons);
       }
       return;
     }
@@ -1314,7 +1314,7 @@ Tabmix.navToolbox = {
 
     if (!onlyPosition) {
       let useTabmixButtons = TabmixTabbar.scrollButtonsMode > TabmixTabbar.SCROLL_BUTTONS_LEFT_RIGHT;
-      gBrowser.tabContainer.mTabstrip.updateScrollButtons(useTabmixButtons);
+      Tabmix.tabsUtils.updateScrollButtons(useTabmixButtons);
     }
   },
 
diff --git a/chrome/content/tab/scrollbox.xml b/chrome/content/tab/scrollbox.xml
index f15b340..3e6a20e 100644
--- a/chrome/content/tab/scrollbox.xml
+++ b/chrome/content/tab/scrollbox.xml
@@ -110,25 +110,6 @@
         document.getAnonymousElementByAttribute(this._scrollbox, "class", "box-inherit scrollbox-innerbox");
       </field>
 
-      <method name="updateScrollButtons">
-        <parameter name="useTabmixButtons"/>
-        <body><![CDATA[
-          this._scrollButtonDown = !useTabmixButtons ?
-              this._scrollButtonDownLeft : this._scrollButtonDownRight;
-          var tabContainer = document.getBindingParent(this);
-          tabContainer._animateElement = this._scrollButtonDown;
-
-          this._scrollButtonUp = !useTabmixButtons ?
-              this._scrollButtonUpLeft : this._scrollButtonUpRight;
-          this._updateScrollButtonsDisabledState();
-          if (!Tabmix.isVersion(320)) {
-            let overflow = Tabmix.tabsUtils.overflow;
-            this._scrollButtonUp.collapsed = !overflow;
-            this._scrollButtonDown.collapsed = !overflow;
-          }
-        ]]></body>
-      </method>
-
       <!-- we replace tabbrowser.xml "tabbrowser-arrowscrollbox" binding with this one
            Override scrollbox.xml method, since our scrollbox's children are
            inherited from the binding parent -->
diff --git a/chrome/content/tab/tab.js b/chrome/content/tab/tab.js
index dfdedbd..95a8808 100644
--- a/chrome/content/tab/tab.js
+++ b/chrome/content/tab/tab.js
@@ -74,7 +74,7 @@ var TabmixTabbar = {
       // from Firefox 4.0+ on we add dynamicly scroll buttons on TabsToolbar.
       let tabmixScrollBox = document.getElementById("tabmixScrollBox");
       if (tabmixScrollBox) // just in case our box is missing
-        tabBar.mTabstrip.updateScrollButtons(useTabmixButtons);
+        Tabmix.tabsUtils.updateScrollButtons(useTabmixButtons);
 
       if (isMultiRow || prevTabscroll == this.SCROLL_BUTTONS_MULTIROW) {
         // temporarily hide vertical scroll button.
@@ -932,6 +932,32 @@ Tabmix.tabsUtils = {
     // one tab before the last is in the first row and we are closing one tab
     let tabs = visibleTabs || gBrowser.visibleTabs;
     return this.getTabRowNumber(tabs[tabs.length - 2], this.topTabY) == 1;
+  },
+
+  /**** gBrowser.tabContainer.mTabstrip helpers ****/
+  /**
+   * this function is here for the case restart-less extension override our
+   * override our mTabstrip binding when Tabmix's uses its own scroll buttons
+   */
+  updateScrollButtons: function(useTabmixButtons) {
+    let tabstrip = this.tabBar.mTabstrip;
+    tabstrip._scrollButtonDown = useTabmixButtons ?
+      tabstrip._scrollButtonDownRight :
+      tabstrip._scrollButtonUpLeft || // fall back to original
+      document.getAnonymousElementByAttribute(tabstrip, "anonid", "scrollbutton-down");
+    this.tabBar._animateElement = tabstrip._scrollButtonDown;
+
+    tabstrip._scrollButtonUp = useTabmixButtons ?
+      tabstrip._scrollButtonUpRight :
+      tabstrip._scrollButtonUpLeft || // fall back to original
+      document.getAnonymousElementByAttribute(tabstrip, "anonid", "scrollbutton-up");
+    tabstrip._updateScrollButtonsDisabledState();
+
+    if (!Tabmix.isVersion(320)) {
+      let overflow = this.overflow;
+      tabstrip._scrollButtonUp.collapsed = !overflow;
+      tabstrip._scrollButtonDown.collapsed = !overflow;
+    }
   }
 };
 

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

