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

fixed :open completions for slow computers. We now yield

Browse Source 
incremental results, and the user gets more completion, the more often
he presses tab. Need to find out, how to change the "Waiting..." message
to "More results...". Also reminds me, how ugly the completion context
code is partly. We should try to clean it up and remove/merge useless
function to make it's interface smaller and more side-effect free.
This commit is contained in:
Martin Stubenschrott
2009-01-07 03:04:42 +01:00
parent db97184fa4
commit 473c461d3f
3 changed files with 55 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
common/content/ui.js
View File

@@ -336,7 +336,7 @@ function CommandLine() //{{{
else
idx = this.selected + 1;
break;
case this.RESET:
case this.RESET: // TODO: never used for now
idx = null;
break;
default:
@@ -360,22 +360,37 @@ function CommandLine() //{{{
tab: function tab(reverse)
{
autocompleteTimer.flush();
// Check if we need to run the completer.
let numElementsNeeded;
if (this.selected == null)
numElementsNeeded = reverse ? 100000 : 1; // better way to specify give me all items than setting to a very large number?
else
numElementsNeeded = reverse ? this.selected : this.selected + 2; // this.selected is zero-based
if (this.context.waitingForTab || this.wildIndex == -1)
this.complete(true, true);
// Would prefer to only do this check when no completion
// is available, but there are complications.
if (this.items.length == 0 || this.context.incomplete)
{
// No items. Wait for any unfinished completers.
let end = Date.now() + 5000;
while (this.context.incomplete && /* this.items.length == 0 && */ Date.now() < end)
liberator.threadYield(true, true);
if (this.items.length == 0)
return liberator.beep();
this.complete(true, true);
}
else if (this.context.incomplete && numElementsNeeded > this.items.length)
{
for (let [, context] in Iterator(this.context.contexts))
{
if (context.incomplete && context.generate)
{
// regenerate twice as many items as needed, as regenerating
// to often looks visually bad
context.minItems = numElementsNeeded * 2; // TODO: document minItems, or find a better way
context.regenerate = true;
context._generate(); // HACK
}
if (this.items.length >= numElementsNeeded)
break;
}
}
if (this.items.length == 0)
return liberator.beep();
switch (this.wildtype.replace(/.*:/, ""))
{
@@ -1435,11 +1450,9 @@ function CommandLine() //{{{
{
autocompleteTimer.reset();
// liberator.dump("Resetting completions...");
if (completions)
{
completions.context.cancelAll();
completions.wildIndex = -1;
completions.previewClear();
}