1
0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-21 20:47:58 +01:00

Merge default.

--HG--
branch : groups
This commit is contained in:
Kris Maglione
2011-02-11 00:45:52 -05:00
2 changed files with 5 additions and 4 deletions

View File

@@ -326,8 +326,8 @@ var CommandMode = Class("CommandMode", {
if (this.complete) if (this.complete)
this.completions = CommandLine.Completions(commandline.widgets.active.command.inputField, this); this.completions = CommandLine.Completions(commandline.widgets.active.command.inputField, this);
if (this.completions && command && options["autocomplete"].length && commandline.commandSession === this) if (this.completions && command && commandline.commandSession === this)
this.completions.complete(true, false); this.completions.autocompleteTimer.flush(true);
}, },
get holdFocus() this.widgets.active.command.inputField, get holdFocus() this.widgets.active.command.inputField,
@@ -1139,7 +1139,8 @@ var CommandLine = Module("commandline", {
if (show) { if (show) {
this.itemList.reset(); this.itemList.reset();
this.itemList.visible = true; if (this.haveType("list"))
this.itemList.visible = true;
this.selected = null; this.selected = null;
this.wildIndex = 0; this.wildIndex = 0;
} }

View File

@@ -454,8 +454,8 @@ var Addons = Module("addons", {
context.title = ["Extension"]; context.title = ["Extension"];
context.anchored = false; context.anchored = false;
context.keys = { text: "name", description: "description", icon: "iconURL" }, context.keys = { text: "name", description: "description", icon: "iconURL" },
context.incomplete = true;
context.generate = function () { context.generate = function () {
context.incomplete = true;
AddonManager.getAddonsByTypes(types || ["extension"], function (addons) { AddonManager.getAddonsByTypes(types || ["extension"], function (addons) {
context.incomplete = false; context.incomplete = false;
context.completions = addons; context.completions = addons;