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

Turn completion sorting back on. Fix completion bug.

Browse Source
This commit is contained in:
Kris Maglione
2008-11-25 03:37:07 +00:00
parent 7a6ae33fdb
commit f4e094b97a
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
content/completion.js
View File

@@ -54,7 +54,7 @@ function CompletionContext(editor, name, offset)
this.parent = parent; this.parent = parent;
this.offset = parent.offset + (offset || 0); this.offset = parent.offset + (offset || 0);
this.keys = util.cloneObject(this.parent.keys); this.keys = util.cloneObject(this.parent.keys);
["editor", "filterFunc", "keys", "title", "top"].forEach(function (key) ["compare", "editor", "filterFunc", "keys", "title", "top"].forEach(function (key)
self[key] = parent[key]); self[key] = parent[key]);
["contextList", "onUpdate", "selectionTypes", "tabPressed", "updateAsync", "value"].forEach(function (key) { ["contextList", "onUpdate", "selectionTypes", "tabPressed", "updateAsync", "value"].forEach(function (key) {
self.__defineGetter__(key, function () this.top[key]); self.__defineGetter__(key, function () this.top[key]);
@@ -68,6 +68,7 @@ function CompletionContext(editor, name, offset)
this._value = editor; this._value = editor;
else else
this.editor = editor; this.editor = editor;
this.compare = function (a, b) String.localeCompare(a.text, b.text);
this.filterFunc = completion.filter; this.filterFunc = completion.filter;
this.keys = { text: 0, description: 1, icon: "icon" }; this.keys = { text: 0, description: 1, icon: "icon" };
this.offset = offset || 0; this.offset = offset || 0;
@@ -193,6 +194,8 @@ CompletionContext.prototype = {
completion.getKey = this.getKey; // XXX completion.getKey = this.getKey; // XXX
this.cache.filtered = this.filterFunc(items.map(function (item) ({ text: text(item), item: item })), this.cache.filtered = this.filterFunc(items.map(function (item) ({ text: text(item), item: item })),
this.filter, this.anchored); this.filter, this.anchored);
if (options.get("wildoptions").has("sort"))
this.cache.filtered.sort(this.compare);
completion.getKey = null; completion.getKey = null;
return this.cache.filtered; return this.cache.filtered;