diff options
| -rw-r--r-- | common/modules/options.jsm | 6 | ||||
| -rw-r--r-- | common/modules/storage.jsm | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/common/modules/options.jsm b/common/modules/options.jsm index e22715e0..49243c34 100644 --- a/common/modules/options.jsm +++ b/common/modules/options.jsm @@ -431,12 +431,14 @@ var Option = Class("Option", { let [, bang, filter] = /^(!?)(.*)/.exec(pattern); filter = Option.dequote(filter); + let quote = this.keepQuotes ? util.identity : Option.quote; + return update(Styles.matchFilter(filter), { bang: bang, filter: filter, result: result !== undefined ? result : !bang, toString: function toString() this.bang + Option.quote(this.filter) + - (typeof this.result === "boolean" ? "" : ":" + Option.quote(this.result)), + (typeof this.result === "boolean" ? "" : ":" + quote(this.result)), }); }, @@ -492,7 +494,7 @@ var Option = Class("Option", { return []; if (!isArray(value)) value = Option.splitList(value, true); - return value.map(Option.parseSite); + return value.map(Option.parseSite, this); }, stringmap: function stringmap(value) array.toObject( diff --git a/common/modules/storage.jsm b/common/modules/storage.jsm index 0e69f509..67500700 100644 --- a/common/modules/storage.jsm +++ b/common/modules/storage.jsm @@ -296,7 +296,7 @@ var File = Class("File", { if (path instanceof Ci.nsIFile) file = path.clone(); else if (/file:\/\//.test(path)) - file = services["file:"]().getFileFromURLSpec(path); + file = services["file:"].getFileFromURLSpec(path); else { try { let expandedPath = File.expandPath(path); |