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

Fix some missed function renames

Browse Source
This commit is contained in:
Kris Maglione
2008-11-15 00:11:00 +00:00
parent 16b1273078
commit bc66cf405c
2 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
content/completion.js
View File

@@ -588,7 +588,7 @@ function Completion() //{{{
} }
} }
if (options.get("wildoptions").has("sort")) if (options.get("wildoptions").has("sort"))
filtered = filtered.sort(function (a, b) util.ciCompare(a[0], b[0]));; filtered = filtered.sort(function (a, b) util.compareIgnoreCase(a[0], b[0]));;
return filtered; return filtered;
} }
@@ -629,7 +629,7 @@ function Completion() //{{{
} }
} }
if (options.get("wildoptions").has("sort")) if (options.get("wildoptions").has("sort"))
filtered = filtered.sort(function (a, b) util.ciCompare(a[0], b[0]));; filtered = filtered.sort(function (a, b) util.compareIgnoreCase(a[0], b[0]));;
return filtered; return filtered;
} }
@@ -639,14 +639,19 @@ function Completion() //{{{
return { return {
setFunctionCompleter: function (func, completers) setFunctionCompleter: function (funcs, completers)
{ {
func.liberatorCompleter = function (func, obj, string, args) { if (!(funcs instanceof Array))
let completer = completers[args.length - 1]; funcs = [funcs];
if (!completer) for (let [,func] in Iterator(funcs))
return []; {
return completer.call(this, this.eval(obj), this.eval(args.pop()) + string, args); func.liberatorCompleter = function (func, obj, string, args) {
}; let completer = completers[args.length - 1];
if (!completer)
return [];
return completer.call(this, this.eval(obj), this.eval(args.pop()) + string, args);
};
}
}, },
// returns the longest common substring // returns the longest common substring

13
content/options.js
View File

@@ -847,14 +847,11 @@ function Options() //{{{
liberator.registerObserver("load_completion", function () liberator.registerObserver("load_completion", function ()
{ {
completion.setFunctionCompleter(options.get, [function () ([o.name, o.description] for (o in options))]); completion.setFunctionCompleter(options.get, [function () ([o.name, o.description] for (o in options))]);
let listPrefs = [function () Components.classes["@mozilla.org/preferences-service;1"] completion.setFunctionCompleter([options.getPref, options.setPref, options.resetPref, options.invertPref],
.getService(Components.interfaces.nsIPrefBranch) [function () Components.classes["@mozilla.org/preferences-service;1"]
.getChildList("", { value: 0 }) .getService(Components.interfaces.nsIPrefBranch)
.map(function (pref) [pref, ""])]; .getChildList("", { value: 0 })
completion.setFunctionCompleter(options.getPref, listPrefs); .map(function (pref) [pref, ""])]);
completion.setFunctionCompleter(options.setPref, listPrefs);
completion.setFunctionCompleter(options.resetPref, listPrefs);
completion.setFunctionCompleter(options.invertPref, listPrefs);
}); });
return { return {