template-tag.js: support Components.utils.import

Author: caisui

common/content/liberator-overlay.js

@@ -30,8 +30,7 @@
 
     let prefix = [BASE];
 
-    //Cu.import("resource://liberator/template-tag.js", modules);
-    loader.loadSubScript("resource://liberator/template-tag.js", modules);
+    Cu.import("resource://liberator/template-tag.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/modules/template-tag.js

@@ -219,10 +219,11 @@ templateXML.map = function templateXmlMap(data, fn) {
     return new TemplateXML(res);
 }
 
+var DOMParser = Components.Constructor("@mozilla.org/xmlextras/domparser;1");
 // xxx: xml check
 templateXML.raw = function templateXmlRaw(portion, args) {
     var str = templateRaw(portion, args);
-    var ps = new DOMParser
+    var ps = DOMParser();
     var doc = ps.parseFromString("<root>" + str + "</root>", "text/xml");
     if (doc.documentElement.tagName === "parsererror") {
         throw SyntaxError(doc.documentElement.childNodes[0].data);