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

Deal with a race.

Browse Source
This commit is contained in:
Kris Maglione
2011-02-11 05:39:54 -05:00
parent 069a0e8147
commit 7cdfa0ea19
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
common/content/commandline.js
View File

@@ -330,6 +330,8 @@ var CommandMode = Class("CommandMode", {
this.completions.autocompleteTimer.flush(true); this.completions.autocompleteTimer.flush(true);
}, },
get active() this === commandline.commandSession,
get holdFocus() this.widgets.active.command.inputField, get holdFocus() this.widgets.active.command.inputField,
get mappingSelf() this, get mappingSelf() this,
@@ -347,6 +349,8 @@ var CommandMode = Class("CommandMode", {
leave: function (stack) { leave: function (stack) {
if (!stack.push) { if (!stack.push) {
commandline.commandSession = null;
if (this.completions) if (this.completions)
this.completions.cleanup(); this.completions.cleanup();
@@ -361,7 +365,6 @@ var CommandMode = Class("CommandMode", {
commandline.hide(); commandline.hide();
this[this.accepted ? "onSubmit" : "onCancel"](commandline.command); this[this.accepted ? "onSubmit" : "onCancel"](commandline.command);
}, this); }, this);
commandline.commandSession = null;
} }
}, },
@@ -990,8 +993,8 @@ var CommandLine = Module("commandline", {
if (events.feedingKeys) if (events.feedingKeys)
this.ignoredCount++; this.ignoredCount++;
if (options["autocomplete"].length) { if (options["autocomplete"].length) {
this.complete(true, false);
this.itemList.visible = true; this.itemList.visible = true;
this.complete(true, false);
} }
}, this); }, this);
this.tabTimer = Timer(0, 0, function tabTell(event) { this.tabTimer = Timer(0, 0, function tabTell(event) {
@@ -1061,6 +1064,8 @@ var CommandLine = Module("commandline", {
this.context.reset(); this.context.reset();
this.context.tabPressed = tabPressed; this.context.tabPressed = tabPressed;
this.session.complete(this.context); this.session.complete(this.context);
if (this.session.active)
return;
this.context.updateAsync = true; this.context.updateAsync = true;
this.reset(show, tabPressed); this.reset(show, tabPressed);
this.wildIndex = 0; this.wildIndex = 0;