Import 1.0 supporting Firefox up to 14.*

[dactyl.git] / common / modules / template.jsm

diff --git a/common/modules/template.jsm b/common/modules/template.jsm
index 61c64cdeae079190451c9041454b4f2477a3fd4c..09300d0e888a419ac729d90439ed92d1b53bb29b 100644 (file)
--- a/common/modules/template.jsm
+++ b/common/modules/template.jsm
@@ -82,13 +82,22 @@ var Binding = Class("Binding", {
     })
 });
 
+["appendChild", "getAttribute", "insertBefore", "setAttribute"].forEach(function (key) {
+    Object.defineProperty(Binding.prototype, key, {
+        configurable: true,
+        enumerable: false,
+        value: function () this.node[key].apply(this.node, arguments),
+        writable: true
+    });
+});
+
 var Template = Module("Template", {
     add: function add(a, b) a + b,
     join: function join(c) function (a, b) a + c + b,
 
     map: function map(iter, func, sep, interruptable) {
-        XML.ignoreWhitespace = false; XML.prettyPrinting = false;
-        if (iter.length) // FIXME: Kludge?
+        XML.ignoreWhitespace = XML.prettyPrinting = false;
+        if (typeof iter.length == "number") // FIXME: Kludge?
             iter = array.iterValues(iter);
         let res = <></>;
         let n = 0;
@@ -192,7 +201,7 @@ var Template = Module("Template", {
             var desc = this.processor[1].call(this, item, item.description);
         }
 
-        XML.ignoreWhitespace = false; XML.prettyPrinting = false;
+        XML.ignoreWhitespace = XML.prettyPrinting = false;
         // <e4x>
         return <div highlight={highlightGroup || "CompItem"} style="white-space: nowrap">
                    <!-- The non-breaking spaces prevent empty elements
@@ -218,7 +227,7 @@ var Template = Module("Template", {
         if (help.initialized && !Set.has(help.tags, topic))
             return <span highlight={type || ""}>{text || token}</span>;
 
-        XML.ignoreWhitespace = false; XML.prettyPrinting = false;
+        XML.ignoreWhitespace = XML.prettyPrinting = false;
         type = type || (/^'.*'$/.test(token)   ? "HelpOpt" :
                         /^\[.*\]$|^E\d{3}$/.test(token) ? "HelpTopic" :
                         /^:\w/.test(token)     ? "HelpEx"  : "HelpKey");
@@ -238,7 +247,7 @@ var Template = Module("Template", {
         if (help.initialized && !Set.has(help.tags, topic))
             return <>{token}</>;
 
-        XML.ignoreWhitespace = false; XML.prettyPrinting = false;
+        XML.ignoreWhitespace = XML.prettyPrinting = false;
         let tag = (/^'.*'$/.test(token)            ? "o" :
                    /^\[.*\]$|^E\d{3}$/.test(token) ? "t" :
                    /^:\w/.test(token)              ? "ex"  : "k");
@@ -249,7 +258,7 @@ var Template = Module("Template", {
     linkifyHelp: function linkifyHelp(str, help) {
         let re = util.regexp(<![CDATA[
             (?P<pre> [/\s]|^)
-            (?P<tag> '[\w-]+' | :(?:[\w-]+!?|!) | (?:._)?<[\w-]+>\w* | \b[a-zA-Z]_(?:\w+|.) | \[[\w-]+\] | E\d{3} )
+            (?P<tag> '[\w-]+' | :(?:[\w-]+!?|!) | (?:._)?<[\w-]+>\w* | \b[a-zA-Z]_(?:[\w[\]]+|.) | \[[\w-;]+\] | E\d{3} )
             (?=      [[\)!,:;./\s]|$)
         ]]>, "gx");
         return this.highlightSubstrings(str, (function () {
@@ -278,7 +287,7 @@ var Template = Module("Template", {
     // if "processStrings" is true, any passed strings will be surrounded by " and
     // any line breaks are displayed as \n
     highlight: function highlight(arg, processStrings, clip, bw) {
-        XML.ignoreWhitespace = false; XML.prettyPrinting = false;
+        XML.ignoreWhitespace = XML.prettyPrinting = false;
         // some objects like window.JSON or getBrowsers()._browsers need the try/catch
         try {
             let str = this.stringify(arg);
@@ -334,6 +343,8 @@ var Template = Module("Template", {
         return this.highlightSubstrings(str, (function () {
             if (filter.length == 0)
                 return;
+
+            XML.ignoreWhitespace = XML.prettyPrinting = false;
             let lcstr = String.toLowerCase(str);
             let lcfilter = filter.toLowerCase();
             let start = 0;
@@ -387,7 +398,7 @@ var Template = Module("Template", {
     </>,
 
     jumps: function jumps(index, elems) {
-        XML.ignoreWhitespace = false; XML.prettyPrinting = false;
+        XML.ignoreWhitespace = XML.prettyPrinting = false;
         // <e4x>
         return <table>
                 <tr style="text-align: left;" highlight="Title">
@@ -413,7 +424,7 @@ var Template = Module("Template", {
     },
 
     options: function options(title, opts, verbose) {
-        XML.ignoreWhitespace = false; XML.prettyPrinting = false;
+        XML.ignoreWhitespace = XML.prettyPrinting = false;
         // <e4x>
         return <table>
                 <tr highlight="Title" align="left">
@@ -440,7 +451,7 @@ var Template = Module("Template", {
         let url = util.fixURI(frame.filename || "unknown");
         let path = util.urlPath(url);
 
-        XML.ignoreWhitespace = false; XML.prettyPrinting = false;
+        XML.ignoreWhitespace = XML.prettyPrinting = false;
         return <a xmlns:dactyl={NS} dactyl:command="buffer.viewSource"
             href={url} path={path} line={frame.lineNumber}
             highlight="URL">{
@@ -449,7 +460,7 @@ var Template = Module("Template", {
     },
 
     table: function table(title, data, indent) {
-        XML.ignoreWhitespace = false; XML.prettyPrinting = false;
+        XML.ignoreWhitespace = XML.prettyPrinting = false;
         let table = // <e4x>
             <table>
                 <tr highlight="Title" align="left">
@@ -470,7 +481,7 @@ var Template = Module("Template", {
 
     tabular: function tabular(headings, style, iter) {
         // TODO: This might be mind-bogglingly slow. We'll see.
-        XML.ignoreWhitespace = false; XML.prettyPrinting = false;
+        XML.ignoreWhitespace = XML.prettyPrinting = false;
         // <e4x>
         return <table>
                 <tr highlight="Title" align="left">
@@ -493,7 +504,7 @@ var Template = Module("Template", {
     },
 
     usage: function usage(iter, format) {
-        XML.ignoreWhitespace = false; XML.prettyPrinting = false;
+        XML.ignoreWhitespace = XML.prettyPrinting = false;
         format = format || {};
         let desc = format.description || function (item) template.linkifyHelp(item.description);
         let help = format.help || function (item) item.name;