From 7afdad0d31a45c13e87a8e99cac6a465165b59f9 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Mon, 20 Sep 2010 08:51:52 -0400
Subject: [PATCH] Update tab binding for 4.0b7. Needs to be applied earlier,
 still.

---
 common/content/bindings.xml | 41 +++++++++++++++++++++++--------------
 common/content/commands.js  |  2 +-
 pentadactyl/install.rdf     |  2 +-
 3 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/common/content/bindings.xml b/common/content/bindings.xml
index 297fa8b8..cef6f710 100644
--- a/common/content/bindings.xml
+++ b/common/content/bindings.xml
@@ -21,23 +21,34 @@
     <binding id="tab" display="xul:hbox"
              extends="chrome://browser/content/tabbrowser.xml#tabbrowser-tab">
         <content context="tabContextMenu" closetabtext="Close Tab">
-            <xul:stack class="tab-icon dactyl-tab-stack">
-                <xul:image xbl:inherits="validate,src=image" role="presentation"
-                           class="tab-icon-image" dactyl:highlight="TabIcon"/>
-                <xul:vbox>
-                    <xul:spring flex="1"/>
-                    <xul:label xbl:inherits="value=ordinal" dactyl:highlight="TabIconNumber"/>
-                    <xul:spring flex="1"/>
+            <xul:stack class="tab-stack" flex="1">
+                <xul:vbox class="tab-progress-container">
+                    <xul:progressmeter class="tab-progress" mode="normal"
+                                       xbl:inherits="value=progresspercent,busy,stalled,fadein,selected"/>
                 </xul:vbox>
+                <xul:hbox class="tab-content" align="center">
+                    <xul:stack class="tab-icon dactyl-tab-stack">
+                        <xul:image xbl:inherits="validate,src=image,fadein,pinned,busy,stalled,selected"
+                                   class="tab-icon-image" dactyl:highlight="TabIcon"
+                                   role="presentation"/>
+                        <xul:vbox>
+                            <xul:spring flex="1"/>
+                            <xul:label xbl:inherits="value=ordinal" dactyl:highlight="TabIconNumber"/>
+                            <xul:spring flex="1"/>
+                        </xul:vbox>
+                    </xul:stack>
+                    <xul:label xbl:inherits="value=ordinal" dactyl:highlight="TabNumber"/>
+                    <xul:label flex="1"
+                               xbl:inherits="value=label,crop,accesskey,fadein,pinned,selected"
+                               class="tab-text" dactyl:highlight="TabText"
+                               role="presentation"/>
+                    <xul:toolbarbutton anonid="close-button"
+                                       xbl:inherits="fadein,pinned,selected"
+                                       tabindex="-1"
+                                       clickthrough="never"
+                                       class="tab-close-button" dactyl:highlight="TabClose"/>
+                </xul:hbox>
             </xul:stack>
-            <xul:label xbl:inherits="value=ordinal" dactyl:highlight="TabNumber"/>
-            <xul:label flex="1"
-                       xbl:inherits="value=label,crop,accesskey"
-                       class="tab-text" dactyl:highlight="TabText"
-                       role="presentation"/>
-            <xul:toolbarbutton anonid="close-button"
-                               tabindex="-1"
-                               class="tab-close-button" dactyl:highlight="TabClose"/>
         </content>
     </binding>
 
diff --git a/common/content/commands.js b/common/content/commands.js
index 2c765486..ca179b67 100644
--- a/common/content/commands.js
+++ b/common/content/commands.js
@@ -912,7 +912,7 @@ const Commands = Module("commands", {
             }
 
             // dynamically get completions as specified with the command's completer function
-            let command = commands.get(cmd);
+            let command = cmd && commands.get(cmd);
             if (!command) {
                 context.highlight(0, cmd && cmd.length, "SPELLCHECK");
                 return;
diff --git a/pentadactyl/install.rdf b/pentadactyl/install.rdf
index 2e3f3b04..44e0b457 100644
--- a/pentadactyl/install.rdf
+++ b/pentadactyl/install.rdf
@@ -14,7 +14,7 @@
             <Description
                 em:id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
                 em:minVersion="3.5"
-                em:maxVersion="4.0b7pre"/>
+                em:maxVersion="4.0b8pre"/>
         </em:targetApplication>
     </Description>
 </RDF>