gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-01-07 22:44:12 +01:00
Code Issues Projects Releases Wiki Activity

Add basic stringmap support to Option.validateCompleter.

Browse Source
This commit is contained in:
Kris Maglione
2011-08-07 12:27:26 -04:00
parent 85dfd5becd
commit f617e3a346
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
common/modules/options.jsm
View File

@@ -307,6 +307,12 @@ var Option = Class("Option", {
context.completions = this.values; context.completions = this.values;
}, },
_completions: function _completions(extra) {
let context = CompletionContext("");
return context.fork("", 0, this, this.completer, extra) ||
context.allItems.items.map(function (item) [item.text]);
},
/** /**
* @property {[[string, string]]} This option's possible values. * @property {[[string, string]]} This option's possible values.
* @see CompletionContext * @see CompletionContext
@@ -689,23 +695,26 @@ var Option = Class("Option", {
* @param {value|[string]} values The value or array of values to validate. * @param {value|[string]} values The value or array of values to validate.
* @returns {boolean} * @returns {boolean}
*/ */
validateCompleter: function validateCompleter(values) { validateCompleter: function validateCompleter(vals) {
if (isObject(vals) && !isArray(vals)) {
let k = values(this._completions({ values: {} })).toObject();
let v = values(this._completions({ value: "" })).toObject();
util.dump(k, v);
return Object.keys(vals).every(Set.has(k)) && values(vals).every(Set.has(v));
}
if (this.values) if (this.values)
var acceptable = this.values.array || this.values; var acceptable = this.values.array || this.values;
else { else
let context = CompletionContext(""); acceptable = this._completions();
acceptable = context.fork("", 0, this, this.completer);
if (!acceptable)
acceptable = context.allItems.items.map(function (item) [item.text]);
}
if (isArray(acceptable)) if (isArray(acceptable))
acceptable = Set(acceptable.map(function ([k]) k)); acceptable = Set(acceptable.map(function ([k]) k));
if (this.type === "regexpmap" || this.type === "sitemap") if (this.type === "regexpmap" || this.type === "sitemap")
return Array.concat(values).every(function (re) Set.has(acceptable, re.result)); return Array.concat(vals).every(function (re) Set.has(acceptable, re.result));
return Array.concat(values).every(Set.has(acceptable)); return Array.concat(vals).every(Set.has(acceptable));
}, },
types: {} types: {}