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

Better option completion/validation.

Browse Source
This commit is contained in:
Kris Maglione
2008-11-28 04:28:38 +00:00
parent 49d331f811
commit 2ef031c756
10 changed files with 39 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
content/options.js
View File

@@ -170,10 +170,10 @@ Option.prototype = {
hasName: function (name) this.names.indexOf(name) >= 0,
isValidValue: function (value)
isValidValue: function (values)
{
if (this.validator)
return this.validator(value);
return this.validator(values);
else
return true;
},
@@ -277,10 +277,9 @@ Option.prototype = {
if (newValue == null)
return "Operator " + operator + " not supported for option type " + this.type;
newValue = this.joinValues(newValue);
if (!this.isValidValue(newValue))
return "E474: Invalid argument: " + values;
this.set(newValue, scope);
this.setValues(newValue, scope);
}
}; //}}}
@@ -744,9 +743,13 @@ function Options() //{{{
if (!opt.value)
completions = [[option.value, "Current value"], [option.defaultValue, "Default value"]].filter(function (f) f[0]);
context.title = ["Option Value"];
if (completer)
{
completions = completions.concat(completer(filter));
let res = completer(context);
if (!res)
return;
completions = completions.concat(res);
if (/list$/.test(option.type))
{
completions = completions.filter(function (val) opt.values.indexOf(val[0]) == -1);
@@ -762,7 +765,6 @@ function Options() //{{{
}
}
context.compare = function (a, b) 0;
context.title = ["Option Value"];
context.completions = completions;
},
literal: true,
@@ -989,6 +991,15 @@ function Options() //{{{
return ret;
},
// TODO: Run this by default?
validateCompleter: function (values)
{
let self = this;
let completions = completion.runCompleter(function (context) self.completer(context), "");
return Array.concat(values).every(
function (value) completions.some(function (item) item[0] == value));
},
get store() storage.options,
getPref: function (name, forcedDefault)