gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-01-04 03:14:11 +01:00
Code Issues Projects Releases Wiki Activity

Rename followDocumentRelationship.

Browse Source
This commit is contained in:
Kris Maglione
2010-10-12 04:22:39 -04:00
parent a3ce7ae169
commit 3c77559614
2 changed files with 82 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
common/content/options.js
View File

@@ -53,15 +53,15 @@ const Option = Class("Option", {
this._op = Option.ops[this.type];
if (extraInfo)
update(this, extraInfo);
if (arguments.length > 3) {
if (this.type == "string")
defaultValue = Commands.quote(defaultValue);
this.defaultValue = this.parse(defaultValue)
}
if (extraInfo)
update(this, extraInfo);
// add no{option} variant of boolean {option} to this.names
if (this.type == "boolean")
this.names = array([name, "no" + name] for (name in values(names))).flatten().array;
@@ -372,11 +372,11 @@ const Option = Class("Option", {
*/
SCOPE_BOTH: 3,
parseRegex: function (value, result) {
parseRegex: function (value, result, flags) {
let [, bang, val] = /^(!?)(.*)/.exec(value);
let re = RegExp(Option.dequote(val));
let re = RegExp(Option.dequote(val), flags);
re.bang = bang;
re.result = arguments.length == 2 ? result : !bang;
re.result = result !== undefined ? result : !bang;
re.toString = function () Option.unparseRegex(this);
return re;
},
@@ -398,31 +398,42 @@ const Option = Class("Option", {
stringify: {
charlist: function (vals) Commands.quote(vals.join("")),
stringlist: function (vals) vals.map(Option.quote).join(","),
stringmap: function (vals) [Option.quote(k, /:/) + ":" + Option.quote(v) for ([k, v] in Iterator(vals))].join(","),
regexlist: function (vals) vals.join(","),
get regexmap() this.regexlist
},
parse: {
number: function (value) Number(Option.dequote(value)),
boolean: function (value) Option.dequote(value) == "true" || value == true ? true : false,
charlist: function (value) Array.slice(Option.dequote(value)),
stringlist: function (value) (value === "") ? [] : Option.splitList(value),
regexlist: function (value) (value === "") ? [] : Option.splitList(value, true).map(Option.parseRegex),
regexlist: function (value) (value === "") ? [] :
Option.splitList(value, true)
.map(function (re) Option.parseRegex(re, undefined, this.regexFlags), this),
stringmap: function (value) array.toObject(
Option.splitList(value, true).map(function (v) {
let [count, key, quote] = Commands.parseArg(v, /:/);
return [key, Option.dequote(v.substr(count + 1))]
})),
regexmap: function (value)
Option.splitList(value, true).map(function (v) {
let [count, re, quote] = Commands.parseArg(v, /:/, true);
v = Option.dequote(v.substr(count + 1));
if (count === v.length)
[v, re] = [re, ".?"];
return Option.parseRegex(re, v);
})
return Option.parseRegex(re, v, this.regexFlags);
}, this)
},
testValues: {