From 0c43618a3f2f03a7d02062a59efd8aef76228e4b Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Mon, 20 Dec 2010 09:24:19 -0500
Subject: [PATCH] Fix an odd :style completion bug.

---
 common/content/dactyl.js  | 12 ++++++------
 common/modules/styles.jsm |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/common/content/dactyl.js b/common/content/dactyl.js
index a60fd5fc..1d9268fd 100644
--- a/common/content/dactyl.js
+++ b/common/content/dactyl.js
@@ -612,7 +612,7 @@ const Dactyl = Module("dactyl", {
         let empty = set("area base basefont br col frame hr img input isindex link meta param"
                             .split(" "));
 
-        let chrome = {};
+        let chromeFiles = {};
         let styles = {};
         for (let [file, ] in Iterator(services["dactyl:"].FILE_MAP)) {
             dactyl.open("dactyl://help/" + file);
@@ -625,7 +625,7 @@ const Dactyl = Module("dactyl", {
             function fix(node) {
                 switch(node.nodeType) {
                     case Node.ELEMENT_NODE:
-                        if (isinstance(node, [HTMLBaseElement, HTMLScriptElement]))
+                        if (isinstance(node, [HTMLBaseElement]))
                             return;
 
                         data.push("<"); data.push(node.localName);
@@ -634,9 +634,9 @@ const Dactyl = Module("dactyl", {
 
                         for (let { name, value } in array.iterValues(node.attributes)) {
                             if (name == "dactyl:highlight") {
+                                set.add(styles, value);
                                 name = "class";
                                 value = "hl-" + value;
-                                set.add(styles, value);
                             }
                             if (name == "href") {
                                 value = node.href;
@@ -648,7 +648,7 @@ const Dactyl = Module("dactyl", {
                                     value = value.replace(/(#|$)/, ".xhtml$1");
                             }
                             if (name == "src" && value.indexOf(":") > 0) {
-                                chrome[value] = value.replace(/.*\//, "");;
+                                chromeFiles[value] = value.replace(/.*\//, "");;
                                 value = value.replace(/.*\//, "");
                             }
                             data.push(" ");
@@ -686,9 +686,9 @@ const Dactyl = Module("dactyl", {
 
         let m, re = /(chrome:[^ ");]+\/)([^ ");]+)/g;
         while ((m = re.exec(data)))
-            chrome[m[0]] = m[2];
+            chromeFiles[m[0]] = m[2];
 
-        for (let [uri, leaf] in Iterator(chrome))
+        for (let [uri, leaf] in Iterator(chromeFiles))
             addURIEntry(leaf, uri);
 
         if (zip)
diff --git a/common/modules/styles.jsm b/common/modules/styles.jsm
index 5a445eb2..19661a0e 100644
--- a/common/modules/styles.jsm
+++ b/common/modules/styles.jsm
@@ -287,7 +287,7 @@ const Styles = Module("Styles", {
         else if (/[\/:]/.test(filter))
             function test(uri) uri.spec === filter;
         else
-            function test(uri) uri.host === filter;
+            function test(uri) { try { return uri.host === filter } catch (e) { return false } };
         test.toString = function toString() filter;
         if (arguments.length < 2)
             return test;