From 31ca8391b9047e763067cfeab91f4821c899cfa6 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Tue, 7 Apr 2009 15:45:26 -0400
Subject: [PATCH] Only apply tab binding if tab numbers are enabled.

---
 common/content/liberator.js |  2 ++
 common/content/style.js     |  8 ++++----
 common/content/tabs.js      | 17 ++++++++++++-----
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/common/content/liberator.js b/common/content/liberator.js
index a10f9300..d6d3a277 100644
--- a/common/content/liberator.js
+++ b/common/content/liberator.js
@@ -136,9 +136,11 @@ const liberator = (function () //{{{
                 },
                 setter: function (opts)
                 {
+                    const self = this;
                     let classes = [v[1] for ([k, v] in Iterator(this.opts)) if (opts.indexOf(k) < 0)];
                     let css = classes.length ? classes.join(",") + "{ display: none; }" : "";
                     styles.addSheet(true, "taboptions", "chrome://*", css);
+                    tabs.tabsBound = Array.some(opts, function(k) k in self.opts);
                     statusline.updateTabCount();
                 }
             }
diff --git a/common/content/style.js b/common/content/style.js
index 24a05657..78cf6770 100644
--- a/common/content/style.js
+++ b/common/content/style.js
@@ -76,9 +76,9 @@ Highlights.prototype.CSS = <![CDATA[
     StatusLineSecure   color: black; background: #a0a0FF /* light-blue */
     StatusLineExtended color: black; background: #a0FFa0 /* light-green */
 
-    TabClose
-    TabIcon
-    TabText
+    TabClose,.tab-close-button
+    TabIcon,.tab-icon
+    TabText,.tab-text
     TabNumber      font-weight: bold; margin: 0px; padding-right: .3ex;
     TabIconNumber {
         font-weight: bold;
@@ -332,7 +332,7 @@ function Styles(name, store, serial)
     {
         let sheets = system ? systemSheets : userSheets;
         let names = system ? systemNames : userNames;
-        if (typeof sheet == "number")
+        if (typeof sheet === "number")
             return sheets[sheet];
         return names[sheet]
     };
diff --git a/common/content/tabs.js b/common/content/tabs.js
index 8772e8f4..c67b442f 100644
--- a/common/content/tabs.js
+++ b/common/content/tabs.js
@@ -204,11 +204,6 @@ function Tabs() //{{{
                 ],
                 validator: Option.validateCompleter
             });
-        let fragment = liberator.has("MacUnix") ? "tab-mac" : "tab";
-        // TODO: Add option, or only apply when go~=[nN]
-        styles.addSheet(true, "tab-binding", "chrome://browser/content/browser.xul",
-            ".tabbrowser-tab { -moz-binding: url(chrome://liberator/content/bindings.xml#" + fragment + ") !important; }");
-
     }
 
     /////////////////////////////////////////////////////////////////////////////}}}
@@ -663,6 +658,18 @@ function Tabs() //{{{
                 yield [i, browsers[i]];
         },
 
+        get tabsBound() {
+            return Boolean(styles.get(true, "tab-binding"))
+        },
+        set tabsBound(val) {
+            let fragment = liberator.has("MacUnix") ? "tab-mac" : "tab";
+            if (!val)
+                styles.removeSheet(true, "tab-binding");
+            else if (!this.tabsBound)
+                styles.addSheet(true, "tab-binding", "chrome://browser/content/browser.xul",
+                    ".tabbrowser-tab { -moz-binding: url(chrome://liberator/content/bindings.xml#" + fragment + ") !important; }");
+        },
+
         get count() getBrowser().mTabs.length,
 
         get options()