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

Fix Option.validateCompleter with non-options.

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

18
common/modules/options.jsm
View File

@@ -307,12 +307,6 @@ 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
@@ -696,9 +690,15 @@ var Option = Class("Option", {
* @returns {boolean} * @returns {boolean}
*/ */
validateCompleter: function validateCompleter(vals) { validateCompleter: function validateCompleter(vals) {
function completions(extra) {
let context = CompletionContext("");
return context.fork("", 0, this, this.completer, extra) ||
context.allItems.items.map(function (item) [item.text]);
};
if (isObject(vals) && !isArray(vals)) { if (isObject(vals) && !isArray(vals)) {
let k = values(this._completions({ values: {} })).toObject(); let k = values(completions.call(this, { values: {} })).toObject();
let v = values(this._completions({ value: "" })).toObject(); let v = values(completions.call(this, { value: "" })).toObject();
util.dump(k, v); util.dump(k, v);
return Object.keys(vals).every(Set.has(k)) && values(vals).every(Set.has(v)); return Object.keys(vals).every(Set.has(k)) && values(vals).every(Set.has(v));
} }
@@ -706,7 +706,7 @@ var Option = Class("Option", {
if (this.values) if (this.values)
var acceptable = this.values.array || this.values; var acceptable = this.values.array || this.values;
else else
acceptable = this._completions(); acceptable = completions.call(this);
if (isArray(acceptable)) if (isArray(acceptable))
acceptable = Set(acceptable.map(function ([k]) k)); acceptable = Set(acceptable.map(function ([k]) k));