From fd897c1f77347fa7f5da54b4a3b02a1cf2d912a0 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Mon, 20 Dec 2010 01:57:11 -0500
Subject: [PATCH] Further disable tab numbers on Gecko 1.9.

---
 common/content/help.xsl |  2 +-
 common/content/tabs.js  | 29 +++++++++++++++--------------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/common/content/help.xsl b/common/content/help.xsl
index 40d2c0f2..485c5b01 100644
--- a/common/content/help.xsl
+++ b/common/content/help.xsl
@@ -160,7 +160,7 @@
                             <xsl:if test="@tag">
                                 <xsl:attribute name="href"><xsl:value-of select="concat('#', substring-before(concat(@tag, ' '), ' '))"/></xsl:attribute>
                             </xsl:if>
-                            <xsl:apply-templates select="node()" mode="help-1"/>
+                            <xsl:apply-templates select="node()[not(self::dactyl:strut)]" mode="help-1"/>
                         </a>
                         <xsl:call-template name="toc">
                             <xsl:with-param name="level" select="$level + 1"/>
diff --git a/common/content/tabs.js b/common/content/tabs.js
index 087168f9..0c250008 100644
--- a/common/content/tabs.js
+++ b/common/content/tabs.js
@@ -37,21 +37,22 @@ const Tabs = Module("tabs", {
     },
 
     _updateTabCount: function () {
-        for (let [i, tab] in Iterator(this.visibleTabs)) {
-            function node(clas) document.getAnonymousElementByAttribute(tab, "class", clas);
-            if (!node("dactyl-tab-number")) {
-                let nodes = {};
-                let dom = util.xmlToDom(<xul xmlns:xul={XUL} xmlns:html={XHTML}
-                    ><xul:hbox highlight="tab-number"><xul:label key="icon" align="center" highlight="TabIconNumber" class="dactyl-tab-number"/></xul:hbox
-                    ><xul:hbox highlight="tab-number"><html:div key="label" highlight="TabNumber"/></xul:hbox
-                ></xul>.*, document, nodes);
-                let img = node("tab-icon-image");
-                img.parentNode.appendChild(dom);
-                tab.__defineGetter__("ordinal", function () Number(nodes.icon.value));
-                tab.__defineSetter__("ordinal", function (i) nodes.icon.value = nodes.label.textContent = i);
+        if (dactyl.has("Gecko2"))
+            for (let [i, tab] in Iterator(this.visibleTabs)) {
+                function node(clas) document.getAnonymousElementByAttribute(tab, "class", clas);
+                if (!node("dactyl-tab-number")) {
+                    let nodes = {};
+                    let dom = util.xmlToDom(<xul xmlns:xul={XUL} xmlns:html={XHTML}
+                        ><xul:hbox highlight="tab-number"><xul:label key="icon" align="center" highlight="TabIconNumber" class="dactyl-tab-number"/></xul:hbox
+                        ><xul:hbox highlight="tab-number"><html:div key="label" highlight="TabNumber"/></xul:hbox
+                    ></xul>.*, document, nodes);
+                    let img = node("tab-icon-image");
+                    img.parentNode.appendChild(dom);
+                    tab.__defineGetter__("ordinal", function () Number(nodes.icon.value));
+                    tab.__defineSetter__("ordinal", function (i) nodes.icon.value = nodes.label.textContent = i);
+                }
+                tab.ordinal = i + 1;
             }
-            tab.ordinal = i + 1;
-        }
         statusline.updateTabCount(true);
     },