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

Fix javascript completion quirk

Browse Source
This commit is contained in:
Kris Maglione
2008-10-07 01:53:50 +00:00
parent 02dc21d930
commit d79b41dbc7
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
content/completion.js
View File

@@ -308,7 +308,7 @@ liberator.Completion = function () //{{{
* If @fn is defined, slice @offset characters from * If @fn is defined, slice @offset characters from
* the results and map them via @fn. * the results and map them via @fn.
*/ */
function objectKeys(objects, key, fn, offset) function objectKeys(objects, key, fn, offset, last)
{ {
if (!(objects instanceof Array)) if (!(objects instanceof Array))
objects = [objects]; objects = [objects];
@@ -334,9 +334,12 @@ liberator.Completion = function () //{{{
compl.push([k, type]); compl.push([k, type]);
} }
} }
compl = buildLongestStartingSubstring(compl, key);
if (fn) if (fn)
{
compl.forEach(function (a) a[0] = fn(a[0].substr(offset))); compl.forEach(function (a) a[0] = fn(a[0].substr(offset)));
key = last + key.substr(offset)
}
compl = buildLongestStartingSubstring(compl, key);
return compl; return compl;
} }
@@ -474,7 +477,7 @@ liberator.Completion = function () //{{{
let obj = preEval + str.substring(get(-3, 0, STATEMENTS), get(-2)[OFFSET]); let obj = preEval + str.substring(get(-3, 0, STATEMENTS), get(-2)[OFFSET]);
let key = preEval + str.substring(get(-2)[OFFSET] + 1, top[OFFSET]) + "''"; let key = preEval + str.substring(get(-2)[OFFSET] + 1, top[OFFSET]) + "''";
key = window.eval(key); key = window.eval(key);
return [top[OFFSET], objectKeys(obj, key + string, liberator.util.escapeString, key.length)]; return [top[OFFSET], objectKeys(obj, key + string, liberator.util.escapeString, key.length, last)];
} }
/* Is this an object reference? */ /* Is this an object reference? */