Merge pull request #102 from caisui/fix/template

Fix/template

Author: maxauthority

common/content/commandline.js

@@ -609,7 +609,7 @@ const CommandLine = Module("commandline", {
                 action = this._echoMultiline;
             }
 
-            if ((flags & this.FORCE_MULTILINE) || (/\n/.test(str) || typeof str == "xml" || str instanceof TemplateSupportsXML ) && !(flags & this.FORCE_SINGLELINE))
+            if ((flags & this.FORCE_MULTILINE) || (/\n/.test(str) || str instanceof TemplateSupportsXML ) && !(flags & this.FORCE_SINGLELINE))
                 action = this._echoMultiline;
 
             if (single)

common/content/javascript.js

@@ -637,8 +637,12 @@ const JavaScript = Module("javascript", {
         options.add(["inspectcontentobjects"],
             "Allow completion of JavaScript objects coming from web content. POSSIBLY INSECURE!",
             "boolean", false);
-        options.add(["expandtemplate"],
-            "Expand TemplateLiteral",
-            "boolean", !("XMLList" in window));
+
+        // TODO: delete me when minVersion is greater than 34
+        if (!liberator.has("template")) {
+            options.add(["expandtemplate"],
+                "Expand TemplateLiteral",
+                "boolean", !("XMLList" in window));
+        }
     }
 })

common/content/liberator-overlay.js

@@ -5,7 +5,10 @@
 
 (function () {
     const modules = {};
-    const BASE = "liberator://template/chrome://liberator/content/"
+    // TODO: FIXME when minVersion is greater than 34
+    var {isSupport: TemplateIsSupport} = Components.utils.import("resource://liberator/CheckTemplate.jsm", {});
+    const BASE = TemplateIsSupport ?
+        "chrome://liberator/content/" : "liberator://template/chrome://liberator/content/";
 
     modules.modules = modules;
 
@@ -30,8 +33,8 @@
 
     let prefix = [BASE];
 
-    //Cu.import("resource://liberator/template-tag.js", modules);
-    loader.loadSubScript("resource://liberator/template-tag.js", modules);
+    // TODO: FIXME when minVersion is greater than 34
+    Components.utils.import("resource://liberator/template-tag" + (TemplateIsSupport ? ".js" : "-old.js"), modules);
 
     // TODO: This list is much too long, we should try to minimize
     // the number of required components for easier porting to new applications

common/content/liberator.js

@@ -332,6 +332,7 @@ const Liberator = Module("liberator", {
      *     should be loaded.
      */
     loadScript: function (uri, context) {
+        // TODO: delete me when minVersion is greater than 34
         if (options.expandtemplate) {
             var prefix = "liberator://template/";
             if (uri.lastIndexOf(prefix, 0) === -1)
@@ -345,6 +346,7 @@ const Liberator = Module("liberator", {
             if (!context)
                 context = userContext;
 
+            // TODO: delete me when minVersion is greater than 34
             if (options.expandtemplate) {
                 var obj = new Object;
                 Cu.import("resource://liberator/template.js", obj);

common/content/statusline.js

@@ -8,9 +8,9 @@
 /**
  * @param {String} name
  * @param {String} description
- * @param {String|TemplateXML} node
+ * @param {String|TemplateSupportsXML} node
  *      String     : the id attribute value of the existing node
- *      TemplateXML: a TemplateXML instance. e.g) xml`<xul:label ...>`
+ *      TemplateSupportsXML: a TemplateSupportsXML instance. e.g) xml`<xul:label ...>`
  * @param {Function} updater
  * @param {Object} extraInfo
  */
@@ -26,13 +26,13 @@ const StatusField = Class("StatusField", {
             if (!this.node)
                 throw new Error('the element is not found: "' + node + '"');
         }
-        else if (node instanceof TemplateXML) {
+        else if (node instanceof TemplateSupportsXML) {
             this.node = util.xmlToDom(node, document);
             this.node.setAttribute("id", "liberator-status-" + name);
             statusline._statuslineWidget.appendChild(this.node);
         }
         else
-            throw new TypeError("the argument node must be String or TemplateXML: " + node);
+            throw new TypeError("the argument node must be String or TemplateSupportsXML: " + node);
 
         this.node.hidden = true;
         if (extraInfo)

common/content/template.js

@@ -33,7 +33,7 @@ const Template = Module("template", {
     },
 
     maybeXML: function maybeXML(val) {
-        if (typeof val == "xml" || val instanceof TemplateSupportsXML)
+        if (val instanceof TemplateSupportsXML)
             return val;
 
         try {
@@ -120,8 +120,6 @@ const Template = Module("template", {
                 if (processStrings && false)
                     str = template.highlightFilter(str, "\n", function () xml`<span highlight="NonText">^J</span>`);
                 return xml`<span highlight="Object">${str}</span>`;
-            case "xml":
-                return arg;
             default:
                 return `<unknown type>`;
             }
@@ -181,7 +179,7 @@ const Template = Module("template", {
     },
 
     highlightSubstrings: function highlightSubstrings(str, iter, highlight) {
-        if (typeof str == "xml" || str instanceof TemplateSupportsXML)
+        if (str instanceof TemplateSupportsXML)
             return str;
         if (str == "")
             return xml`${str}`;

common/content/util.js

@@ -5,22 +5,18 @@
 
 /** @scope modules */
 
-//xxx:
-this.$$Namespace = function (prefix, uri) {
-    return "XMLList" in window ? Namespace(prefix, uri)
-        : {
-            prefix: prefix,
-            uri: uri,
-            toString: function () {
-                return this.uri;
-            },
+const {XHTML, XUL, NS} = (function () {
+    function Namespace(prefix, uri) {
+        this.prefix = prefix;
+        this.uri = uri;
+    }
+    Namespace.prototype.toString = function toString() { return this.uri; };
+    return {
+        XHTML: new Namespace("html", "http://www.w3.org/1999/xhtml"),
+        XUL  : new Namespace("xul", "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"),
+        NS   : new Namespace("liberator", "http://vimperator.org/namespaces/liberator"),
     };
-}
-const XHTML = $$Namespace("html", "http://www.w3.org/1999/xhtml");
-const XUL = $$Namespace("xul", "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-const NS =  $$Namespace("liberator", "http://vimperator.org/namespaces/liberator");
-if ("XMLList" in window) eval("default xml namespace = XHTML");
-delete this.$$Namespace;
+})();
 
 const Util = Module("util", {
     init: function () {
@@ -737,9 +733,6 @@ const Util = Module("util", {
      * @returns {Node|DocumentFragment}
      */
     xmlToDom: function xmlToDom(node, doc, nodes) {
-        if (typeof node === "xml")
-            return this.xmlToDomForE4X(node, doc, nodes);
-
         var dom = this.xmlToDomForTemplate(node, doc, nodes);
 
         //xxx: change highlight's namespace
@@ -753,39 +746,6 @@ const Util = Module("util", {
         }
         return dom;
     },
-    /**
-     * Converts an E4X XML literal to a DOM node.
-     *
-     * @param {Node} node
-     * @param {Document} doc
-     * @param {Object} nodes
-     * @returns {Node}
-     * @deprecated
-     * @see util.xmlToDom
-     */
-    xmlToDomForE4X: function xmlToDomForE4X(node, doc, nodes) {
-        if (node.length() != 1) {
-            let domnode = doc.createDocumentFragment();
-            for each (let child in node)
-                domnode.appendChild(arguments.callee(child, doc, nodes));
-            return domnode;
-        }
-        switch (node.nodeKind()) {
-        case "text":
-            return doc.createTextNode(String(node));
-        case "element":
-            let domnode = doc.createElementNS(node.namespace(), node.localName());
-            for each (let attr in node.attributes())
-                domnode.setAttributeNS(attr.name() == "highlight" ? NS.uri : attr.namespace(), attr.name(), String(attr));
-            for each (let child in node.children())
-                domnode.appendChild(arguments.callee(child, doc, nodes));
-            if (nodes && node.attribute("key"))
-                nodes[node.attribute("key")] = domnode;
-            return domnode;
-        default:
-            return null;
-        }
-    },
     /**
      * Converts an string of TemplateXML object to a DOM node.
      *

common/modules/CheckTemplate.jsm

@@ -0,0 +1,11 @@
+// vim: ft=javascript
+// TODO: delete me when minVersion is greater than 34
+
+var EXPORTED_SYMBOLS = ["isSupport"];
+
+try {
+    var isSupport = eval("((a,b)=>a.length)`${1}` === 2");
+} catch (ex) {
+    Components.utils.reportError(ex);
+    isSupport = false;
+}

common/modules/template-tag-old.js

@@ -0,0 +1,19 @@
+// TODO: delete me when minVersion is greater than 34
+
+var EXPORTED_SYMBOLS = ["xml", "TemplateSupportsXML"];
+(function () {
+    var {xml, TemplateSupportsXML} = Components.utils.import("resource://liberator/template-tag.js", {});
+    this.xml = function xml_tagged_hack(portion, args) {
+        try {
+            return xml.apply(xml, [portion].concat(args));
+        } catch (ex) {
+            Components.utils.reportError(ex);
+            Components.utils.reportError(ex.stack);
+            throw ex;
+        }
+    };
+
+    for (var a in xml)
+        this.xml[a] = xml[a];
+    this.TemplateSupportsXML = TemplateSupportsXML;
+}).call(this);