use firefox's template literal(>=Fx35)

Author: caisui

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 35
+        if (!liberator.has("template")) {
+            options.add(["expandtemplate"],
+                "Expand TemplateLiteral",
+                "boolean", !("XMLList" in window));
+        }
     }
 })

common/content/liberator-overlay.js

@@ -5,7 +5,9 @@
 
 (function () {
     const modules = {};
-    const BASE = "liberator://template/chrome://liberator/content/"
+    var {isSupport: TemplateIsSupport} = Cu.import("resource://liberator/CheckTemplate.jsm", {});
+    const BASE = TemplateIsSupport ?
+        "chrome://liberator/content/" : "liberator://template/chrome://liberator/content/";
 
     modules.modules = modules;
 
@@ -30,7 +32,7 @@
 
     let prefix = [BASE];
 
-    Cu.import("resource://liberator/template-tag.js", modules);
+    Cu.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 35
         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 35
             if (options.expandtemplate) {
                 var obj = new Object;
                 Cu.import("resource://liberator/template.js", obj);

common/modules/CheckTemplate.jsm

@@ -0,0 +1,10 @@
+// vim: ft=javascript
+
+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,18 @@
+
+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);

common/modules/template-tag.js

@@ -60,7 +60,7 @@ function TemplateXML(s) {this.value = s;}
 TemplateXML.prototype = new TemplateSupportsXML;
 TemplateXML.prototype.toString = function () this.value;
 
-function templateXML(portion, args) // {{{
+function templateXML(portion, ...args) // {{{
 {
     var res = "";
 
@@ -221,7 +221,7 @@ templateXML.map = function templateXmlMap(data, fn) {
 
 var DOMParser = Components.Constructor("@mozilla.org/xmlextras/domparser;1");
 // xxx: xml check
-templateXML.raw = function templateXmlRaw(portion, args) {
+templateXML.raw = function templateXmlRaw(portion, ...args) {
     var str = templateRaw(portion, args);
     var ps = DOMParser();
     var doc = ps.parseFromString("<root>" + str + "</root>", "text/xml");
@@ -230,7 +230,7 @@ templateXML.raw = function templateXmlRaw(portion, args) {
     }
     return new TemplateXML(str);
 };
-templateXML.cdata = function templateXmlCDATA(portion, args) {
+templateXML.cdata = function templateXmlCDATA(portion, ...args) {
     return new TemplateXML("<![CDATA[" + templateRaw(portion, args).replace(/>/g, "&gt;") + "]]>");
 };
 templateXML["+="] = function (self, value) {

common/modules/template.js

@@ -1,3 +1,4 @@
+// TODO: delete me when minversion is greater than 35
 var EXPORTED_SYMBOLS = ["convert"];
 const Cu = Components.utils;
 

muttator/content/config.js

@@ -9,6 +9,9 @@ const Config = Module("config", ConfigBase, {
     init: function () {
         // don't wait too long when selecting new messages
         // GetThreadTree()._selectDelay = 300; // TODO: make configurable
+
+        var {isSupport} = Cu.import("resource://liberator/CheckTemplate.jsm", {});
+        if (isSupport) this.features.add("template");
     },
 
     /*** required options, no checks done if they really exist, so be careful ***/

vimperator/content/config.js

@@ -7,6 +7,8 @@
 
 const Config = Module("config", ConfigBase, {
     init: function () {
+        var {isSupport} = Cu.import("resource://liberator/CheckTemplate.jsm", {});
+        if (isSupport) this.features.add("template");
     },
 
     /*** required options, no checks done if they really exist, so be careful ***/