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

Reset progress indicator on location change.

Browse Source
This commit is contained in:
Kris Maglione
2011-02-04 20:24:50 -05:00
parent 6a3d5dcfce
commit e9fd99dafa
9 changed files with 57 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
common/content/options.js
View File

@@ -163,10 +163,6 @@ var Option = Class("Option", {
setValues: deprecated("Option#set", "set"),
joinValues: deprecated("Option#stringify", "stringify"),
parseValues: deprecated("Option#parse", "parse"),
values: deprecated("Option#value", {
get: function values() this.value,
set: function values(val) this.value = val
}),
/**
* @property {value} The option's current value. The option's local value,
@@ -283,7 +279,16 @@ var Option = Class("Option", {
* @property {function(CompletionContext, Args)} This option's completer.
* @see CompletionContext
*/
completer: null,
completer: function (context) {
if (this.values)
context.completions = this.values;
},
/**
* @property {[[string, string]]} This option's possible values.
* @see CompletionContext
*/
values: null,
/**
* @property {function(host, values)} A function which should return a list
@@ -340,7 +345,7 @@ var Option = Class("Option", {
* when set.
*/
validator: function () {
if (this.completer)
if (this.values || this.completer !== Option.prototype.completer)
return Option.validateCompleter.apply(this, arguments);
return true;
},
@@ -601,13 +606,17 @@ var Option = Class("Option", {
* @returns {boolean}
*/
validateCompleter: function (values) {
let context = CompletionContext("");
let res = context.fork("", 0, this, this.completer);
if (!res)
res = context.allItems.items.map(function (item) [item.text]);
if (this.values)
var acceptable = this.values;
else {
let context = CompletionContext("");
acceptable = context.fork("", 0, this, this.completer);
if (!acceptable)
acceptable = context.allItems.items.map(function (item) [item.text]);
}
if (this.type == "regexpmap")
return Array.concat(values).every(function (re) res.some(function (item) item[0] == re.result));
return Array.concat(values).every(function (value) res.some(function (item) item[0] == value));
return Array.concat(values).every(function (re) acceptable.some(function (item) item[0] == re.result));
return Array.concat(values).every(function (value) acceptable.some(function (item) item[0] == value));
},
validateXPath: function (values) {