[Pkg-mozext-commits] [tabmixplus] 12/51: Move setTabStripOrient to Tabmix.tabsUtils

Mon Feb 2 18:36:46 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 fe16301b747070d2d76f864655fe0136597275f0
Author: onemen <tabmix.onemen at gmail.com>
Date:   Fri Jan 2 22:29:44 2015 +0200

    Move setTabStripOrient to Tabmix.tabsUtils
---
 chrome/content/tab/tab.js           | 16 +++++++++++++---
 chrome/content/tab/tabbrowser_4.xml | 13 +------------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/chrome/content/tab/tab.js b/chrome/content/tab/tab.js
index 79f522c..75ac73e 100644
--- a/chrome/content/tab/tab.js
+++ b/chrome/content/tab/tab.js
@@ -115,10 +115,10 @@ var TabmixTabbar = {
         // Don't change tabstip orient on start before sessionStore ends.
         // if we set orient to vertical before sessionStore finish
         // sessionStore don't select the selected tab from last session.
-        setTimeout(function() {tabBar.setTabStripOrient();}, 0);
+        setTimeout(function() {Tabmix.tabsUtils.setTabStripOrient();}, 0);
       }
       else
-        tabBar.setTabStripOrient();
+        Tabmix.tabsUtils.setTabStripOrient();
     }
     Tabmix.setItem(tabBar, "widthFitTitle", this.widthFitTitle || null);
 
@@ -674,7 +674,7 @@ Tabmix.tabsUtils = {
     }
 
     TabmixTabbar.flowing = this.tabBar.getAttribute("flowing");
-    this.tabBar.setTabStripOrient();
+    this.setTabStripOrient();
     Tabmix.navToolbox.setScrollButtons(true);
 
     // fix incompatibility with Personal Titlebar extension
@@ -685,6 +685,16 @@ Tabmix.tabsUtils = {
       TabmixTabbar.updateSettings(false);
       Tabmix.navToolbox.resetUI = true;
     }
+  },
+
+  setTabStripOrient: function() {
+    // we can't set dispaly:block and orient=vertical when widthFitTitle is false
+    // and we are in one row.
+    let vertical = TabmixTabbar.isMultiRow &&
+        (TabmixTabbar.widthFitTitle || this.tabBar.hasAttribute("multibar"));
+    let tabstrip = this.tabBar.mTabstrip;
+    Tabmix.setItem(tabstrip, "orient", vertical ? "vertical" : "horizontal");
+    tabstrip._isRTLScrollbox = !vertical && Tabmix.rtl;
   }
 };
 
diff --git a/chrome/content/tab/tabbrowser_4.xml b/chrome/content/tab/tabbrowser_4.xml
index 57f3ab6..b119fe7 100644
--- a/chrome/content/tab/tabbrowser_4.xml
+++ b/chrome/content/tab/tabbrowser_4.xml
@@ -394,7 +394,7 @@
             Tabmix.setItem("TabsToolbar", "multibar", multibar);
           }
 
-          this.setTabStripOrient();
+          Tabmix.tabsUtils.setTabStripOrient();
           TabmixTabbar.setHeight(rows, aReset);
 
           if (this.mTabstrip.orient == "vertical")
@@ -436,17 +436,6 @@
         ]]></body>
       </method>
 
-      <method name="setTabStripOrient">
-        <body><![CDATA[
-          // we can't set dispaly:block and orient=vertical when widthFitTitle is false
-          // and we are in one row.
-          let vertical = TabmixTabbar.isMultiRow &&
-              (TabmixTabbar.widthFitTitle || this.hasAttribute("multibar"));
-          Tabmix.setItem(this.mTabstrip, "orient", vertical ? "vertical" : "horizontal");
-          this.mTabstrip._isRTLScrollbox = !vertical && Tabmix.rtl;
-        ]]></body>
-      </method>
-
       <property name="overflow">
         <getter><![CDATA[
           return this.hasAttribute("overflow");

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

