gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-01-04 11:44:11 +01:00
Code Issues Projects Releases Wiki Activity

Revert "fixed :open completions for slow computers. We now yield"

Browse Source 
This reverts commit b32cfe76ff5f5a22e868eb8ab97191b12561e16e.
This commit is contained in:
Kris Maglione
2009-01-06 22:09:35 -05:00
parent 0cb74ad157
commit 3116c16d54
3 changed files with 26 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
common/content/ui.js
View File

@@ -362,7 +362,7 @@ function CommandLine() //{{{
else
idx = this.selected + 1;
break;
case this.RESET: // TODO: never used for now
case this.RESET:
idx = null;
break;
default:
@@ -386,37 +386,22 @@ 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);
}
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();
// 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();
}
switch (this.wildtype.replace(/.*:/, ""))
{
@@ -1619,9 +1604,11 @@ function CommandLine() //{{{
{
autocompleteTimer.reset();
// liberator.dump("Resetting completions...");
if (completions)
{
completions.context.cancelAll();
completions.wildIndex = -1;
completions.previewClear();
}