From 2d957c37f82db62f4c1af014a89bb88d2f65723f Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Thu, 2 Dec 2010 18:00:20 -0500
Subject: [PATCH] Small fixes. Add Components to list of magical JS global
 properties.

--HG--
extra : rebase_source : ba08f90f02d5362108cfbffd2f9ce9a89d8e905e
---
 common/content/javascript.js | 2 +-
 common/content/options.js    | 6 ++----
 common/modules/sanitizer.jsm | 4 ++--
 common/modules/services.jsm  | 2 +-
 common/modules/template.jsm  | 2 +-
 5 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/common/content/javascript.js b/common/content/javascript.js
index f575219b..6becefa0 100644
--- a/common/content/javascript.js
+++ b/common/content/javascript.js
@@ -607,7 +607,7 @@ const JavaScript = Module("javascript", {
      * enumerable by any standard method.
      */
     globalNames: Class.memoize(function () array.uniq([
-        "Array", "ArrayBuffer", "AttributeName", "Boolean",
+        "Array", "ArrayBuffer", "AttributeName", "Boolean", "Components",
         "CSSFontFaceStyleDecl", "CSSGroupRuleRuleList", "CSSNameSpaceRule",
         "CSSRGBColor", "CSSRect", "ComputedCSSStyleDeclaration", "Date",
         "Error", "EvalError", "Float32Array", "Float64Array", "Function",
diff --git a/common/content/options.js b/common/content/options.js
index bca25522..b0ac3b2c 100644
--- a/common/content/options.js
+++ b/common/content/options.js
@@ -752,7 +752,7 @@ const Options = Module("options", {
         let matches, prefix, postfix, valueGiven;
 
         [matches, prefix, ret.name, postfix, valueGiven, ret.operator, ret.value] =
-        args.match(/^\s*(no|inv)?([a-z_-]*?)([?&!])?\s*(([-+^]?)=(.*))?\s*$/) || [];
+        args.match(/^\s*(no|inv)?([a-z_.-]*?)([?&!])?\s*(([-+^]?)=(.*))?\s*$/) || [];
 
         ret.args = args;
         ret.onlyNonDefault = false; // used for :set to print non-default options
@@ -1089,9 +1089,7 @@ const Options = Module("options", {
                 },
                 update({
                     bang: true,
-                    completer: function (context, args) {
-                        return setCompleter(context, args);
-                    },
+                    completer: setCompleter,
                     domains: function (args) array.flatten(args.map(function (spec) {
                         try {
                             let opt = options.parseOpt(spec);
diff --git a/common/modules/sanitizer.jsm b/common/modules/sanitizer.jsm
index 326f3889..fed55177 100644
--- a/common/modules/sanitizer.jsm
+++ b/common/modules/sanitizer.jsm
@@ -377,14 +377,14 @@ const Sanitizer = Module("sanitizer", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakR
                 let items = args.slice();
                 if (args.bang) {
                     dactyl.assert(args.length == 0, "E488: Trailing characters");
-                    items = Object.keys(sanitizer.itemDescriptions).filter(
+                    items = Object.keys(sanitizer.itemMap).filter(
                         function (k) modules.options.get("sanitizeitems").has(k));
                 }
                 else
                     dactyl.assert(modules.options.get("sanitizeitems").validator(items), "Valid items required");
 
                 if (items.indexOf("all") >= 0)
-                    items = Object.keys(sanitizer.itemDescriptions).filter(function (k) items.indexOf(k) === -1);
+                    items = Object.keys(sanitizer.itemMap).filter(function (k) items.indexOf(k) === -1);
 
                 sanitizer.range = range;
                 sanitizer.ignoreTimespan = range.min == null;
diff --git a/common/modules/services.jsm b/common/modules/services.jsm
index 844c2dd9..6591e73f 100644
--- a/common/modules/services.jsm
+++ b/common/modules/services.jsm
@@ -143,7 +143,7 @@ const Services = Module("Services", {
             Components.utils.import("resource://gre/modules/AddonManager.jsm", modules);
     },
     javascript: function (dactyl, modules) {
-        modules.JavaScript.setCompleter(this.get, [function () services.services]);
+        modules.JavaScript.setCompleter(this.get, [function () [[k, v] for ([k, v] in Iterator(services)) if (v instanceof Ci.nsISupports)]]);
         modules.JavaScript.setCompleter(this.create, [function () [[c, ""] for (c in services.classes)]]);
     }
 });
diff --git a/common/modules/template.jsm b/common/modules/template.jsm
index e6368b43..09d0d0df 100644
--- a/common/modules/template.jsm
+++ b/common/modules/template.jsm
@@ -184,7 +184,7 @@ const Template = Module("Template", {
         let n = 0;
         for (let [i, length] in iter) {
             if (n++ > 50) // Prevent infinite loops.
-                return s + <>{str.substr(start)}</>;
+                break;
             XML.ignoreWhitespace = false;
             s += <>{str.substring(start, i)}</>;
             s += highlight(str.substr(i, length));