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

JavaScript completion fixes.

Browse Source
This commit is contained in:
Kris Maglione
2008-10-09 01:43:22 +00:00
parent b350867a7e
commit a3e898f810
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
content/completion.js
View File

@@ -423,6 +423,12 @@ liberator.Completion = function () //{{{
let key = str.substring(get(-2, 0, STATEMENTS), top[OFFSET]) + "''"; let key = str.substring(get(-2, 0, STATEMENTS), top[OFFSET]) + "''";
let completer = this.completers[func]; let completer = this.completers[func];
try
{
if (!completer)
completer = eval(obj)[func].liberatorCompleter;
}
catch (e) {}
if (!completer) if (!completer)
return [0, []]; return [0, []];
@@ -438,8 +444,11 @@ liberator.Completion = function () //{{{
let compl = completer.call(this, func, preEval, obj, string, args); let compl = completer.call(this, func, preEval, obj, string, args);
key = eval(preEval + key); key = eval(preEval + key);
return [0, this.filter(compl, key + string, last, key.length)]; return [top[OFFSET], this.filter(compl, key + string, last, key.length)];
} }
// Nothing to do.
return [0, []];
} }
/* /*
@@ -603,8 +612,6 @@ liberator.Completion = function () //{{{
{ {
if (!filter && cacheFilter[key] || filter.indexOf(cacheFilter[key]) != 0) if (!filter && cacheFilter[key] || filter.indexOf(cacheFilter[key]) != 0)
cacheResults[key] = generate(filter); cacheResults[key] = generate(filter);
if (key == "searches")
liberator.dump({keyword: key, cacheFilter: cacheFilter[key], filter: filter, searches: {toString: function() json.encode(cacheResults[key])}});
cacheFilter[key] = filter; cacheFilter[key] = filter;
if (cacheResults[key].length) if (cacheResults[key].length)
return cacheResults[key] = this[method].apply(this, [cacheResults[key], filter].concat(Array.splice(arguments, 4))); return cacheResults[key] = this[method].apply(this, [cacheResults[key], filter].concat(Array.splice(arguments, 4)));