gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-01-03 19:04:10 +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

37
common/content/completion.js
View File

@@ -528,9 +528,7 @@ CompletionContext.prototype = {
cancelAll: function ()
{
// Kris: contextList gives undefined. And why do we have contexts and contextList?
// I am not too much of a fan of a huge API for classes
for (let [,context] in Iterator(this.top.contexts))
for (let [,context] in Iterator(this.contextList))
{
if (context.cancel)
context.cancel();
@@ -1578,7 +1576,6 @@ function Completion() //{{{
context.filterFunc = null;
context.cancel = function () services.get("autoCompleteSearch").stopSearch();
context.compare = null;
// TODO: shouldn't this timer be deleted by context.cancel?
let timer = new Timer(50, 100, function (result) {
context.incomplete = result.searchResult >= result.RESULT_NOMATCH_ONGOING;
context.completions = [
@@ -1586,28 +1583,16 @@ function Completion() //{{{
for (i in util.range(0, result.matchCount))
];
});
context.generate = function () {
let minItems = context.minItems || 1;
services.get("autoCompleteSearch").stopSearch();
services.get("autoCompleteSearch").startSearch(context.filter, "", context.result, {
onSearchResult: function (search, result)
{
context.result = result;
timer.tell(result);
if (result.searchResult <= result.RESULT_SUCCESS)
timer.flush();
}
});
let end = Date.now() + 5000;
while (context.incomplete && context.completions.length < minItems && Date.now() < end)
liberator.threadYield(false, true);
// context.message = "More results..."; // very very strange, if I enable this line, completions don't work;
services.get("autoCompleteSearch").stopSearch();
return context.completions;
}
services.get("autoCompleteSearch").stopSearch();
services.get("autoCompleteSearch").startSearch(context.filter, "", context.result, {
onSearchResult: function onSearchResult(search, result)
{
context.result = result;
timer.tell(result);
if (result.searchResult <= result.RESULT_SUCCESS)
timer.flush();
}
});
},
macro: function macro(context)