Merge pull request #113 from caisui/fix/string.quote

Fix/string.quote (Firefox 37 compatibility)

Author: maxauthority

common/content/bookmarks.js

@@ -620,7 +620,7 @@ const Bookmarks = Module("bookmarks", {
                     let url = args.string || buffer.URL;
                     let deletedCount = bookmarks.remove(url);
 
-                    liberator.echomsg("Deleted " + deletedCount + " bookmark(s) with url: " + url.quote());
+                    liberator.echomsg("Deleted " + deletedCount + " bookmark(s) with url: " + JSON.stringify(url));
                 }
 
             },

common/content/buffer.js

@@ -912,7 +912,7 @@ const Buffer = Module("buffer", {
             if (bookmarks.isBookmarked(this.URL))
                 xml["+="](info, ", bookmarked");
 
-            let pageInfoText = xml`${file.quote()} [${info}] ${title}`;
+            let pageInfoText = xml`${JSON.stringify(file)} [${info}] ${title}`;
             liberator.echo(pageInfoText, commandline.FORCE_SINGLELINE);
             return;
         }

common/content/commands.js

@@ -1068,7 +1068,7 @@ const Commands = Module("commands", {
                                     var completer = liberator.eval(completeOpt);
 
                                     if (!(completer instanceof Function))
-                                        throw new TypeError("User-defined custom completer " + completeOpt.quote() + " is not a function");
+                                        throw new TypeError("User-defined custom completer " + JSON.stringify(completeOpt) + " is not a function");
                                 }
                                 catch (e) {
                                     liberator.echoerr("Unknown function: " + completeOpt);

common/content/hints.js

@@ -155,7 +155,7 @@ const Hints = Module("hints", {
                     case "label":
                         if (elem.id) {
                             // TODO: (possibly) do some guess work for label-like objects
-                            let label = util.evaluateXPath(["label[@for=" + elem.id.quote() + "]"], doc).snapshotItem(0);
+                            let label = util.evaluateXPath(["label[@for=" + JSON.stringify(elem.id) + "]"], doc).snapshotItem(0);
                             if (label)
                                 return [label.textContent.toLowerCase(), true];
                         }
@@ -507,9 +507,9 @@ const Hints = Module("hints", {
             let css = [];
             // FIXME: Broken for imgspans.
             for (let { doc } of this._docs) {
-                for (let elem in util.evaluateXPath(" {//*[@liberator:highlight and @number]", doc)) {
+                for (let elem in util.evaluateXPath("//*[@liberator:highlight and @number]", doc)) {
                     let group = elem.getAttributeNS(NS.uri, "highlight");
-                    css.push(highlight.selector(group) + "[number=" + elem.getAttribute("number").quote() + "] { " + elem.style.cssText + " }");
+                    css.push(highlight.selector(group) + "[number=" + JSON.stringify(elem.getAttribute("number")) + "] { " + elem.style.cssText + " }");
                 }
             }
             styles.addSheet(true, "hint-positions", "*", css.join("\n"));

common/content/io.js

@@ -886,7 +886,7 @@ lookup:
                     }
 
                     if (!found)
-                        liberator.echoerr("Can't find directory " + arg.quote() + " in cdpath\n" + "Command failed");
+                        liberator.echoerr("Can't find directory " + JSON.stringify(arg) + " in cdpath\n" + "Command failed");
                 }
             }, {
                 argCount: "?",

common/content/liberator.js

@@ -646,7 +646,7 @@ const Liberator = Module("liberator", {
             if (helpFile in services.get("liberator:").FILE_MAP)
                 liberator.open("liberator://help/" + helpFile, { from: "help" });
             else
-                liberator.echomsg("Sorry, help file " + helpFile.quote() + " not found");
+                liberator.echomsg("Sorry, help file " + JSON.stringify(helpFile) + " not found");
             return;
         }
 
@@ -1357,7 +1357,7 @@ const Liberator = Module("liberator", {
                     liberator.echoerr("Invalid argument: " + arg);
                 }
                 catch (e) {
-                    liberator.echoerr("Error opening " + arg.quote() + ": " + e);
+                    liberator.echoerr("Error opening " + JSON.stringify(arg) + ": " + e);
                 }
             }, {
                 argCount: "1",

common/content/marks.js

@@ -166,7 +166,7 @@ const Marks = Module("marks", {
 
         if (filter.length > 0) {
             marks = marks.filter(function (mark) filter.indexOf(mark[0]) >= 0);
-            liberator.assert(marks.length > 0, "No matching marks for: " + filter.quote());
+            liberator.assert(marks.length > 0, "No matching marks for: " + JSON.stringify(filter));
         }
 
         let list = template.tabular(
@@ -306,7 +306,7 @@ const Marks = Module("marks", {
 
                 // ignore invalid mark characters unless there are no valid mark chars
                 liberator.assert(!args || /[a-zA-Z]/.test(args),
-                    "No matching marks for: " + args.quote());
+                    "No matching marks for: " + JSON.stringify(args));
 
                 let filter = args.replace(/[^a-zA-Z]/g, "");
                 marks.list(filter);

common/content/options.js

@@ -532,7 +532,7 @@ const Options = Module("options", {
 
         if (option.name in this._optionHash) {
             // never replace for now
-            liberator.echomsg("Option '" + names[0].quote() + "' already exists, NOT replacing existing option.");
+            liberator.echomsg("Option '" + JSON.stringify(names[0]) + "' already exists, NOT replacing existing option.");
             return false;
         }
 

common/content/style.js

@@ -339,9 +339,9 @@ function Styles(name, store) {
     const storage = modules.storage;
     const ios = services.get("io");
     const sss = Cc["@mozilla.org/content/style-sheet-service;1"].getService(Ci.nsIStyleSheetService);
-    const namespace = "@namespace html " + XHTML.uri.quote() + ";\n" +
-                      "@namespace xul " + XUL.uri.quote() + ";\n" +
-                      "@namespace liberator " + NS.uri.quote() + ";\n";
+    const namespace = "@namespace html " + JSON.stringify(XHTML.uri) + ";\n" +
+                      "@namespace xul " + JSON.stringify(XUL.uri) + ";\n" +
+                      "@namespace liberator " + JSON.stringify(NS.uri) + ";\n";
 
     const Sheet = Struct("name", "id", "sites", "css", "system", "agent");
     Sheet.prototype.__defineGetter__("fullCSS", function wrapCSS() {

common/content/template.js

@@ -98,7 +98,7 @@ const Template = Module("template", {
                 return xml`<span highlight="Number">${str}</span>`;
             case "string":
                 if (processStrings)
-                    str = str.quote();
+                    str = JSON.stringify(str);
                 return xml`<span highlight="String">${str}</span>`;
             case "boolean":
                 return xml`<span highlight="Boolean">${str}</span>`;