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

Fix lost keys when opening command line for the first time. Fix cleanup issue.

Browse Source
This commit is contained in:
Kris Maglione
2011-02-06 13:50:00 -05:00
parent 221ddd46b0
commit 4d9c196b6c
5 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
common/content/commandline.js
View File

@@ -306,12 +306,6 @@ var CommandWidgets = Class("CommandWidgets", {
var CommandMode = Class("CommandMode", {
init: function init() {
this.keepCommand = userContext.hidden_option_command_afterimage;
if (this.historyKey)
this.history = CommandLine.History(commandline.widgets.active.command.inputField, this.historyKey, this);
if (this.complete)
this.completions = CommandLine.Completions(commandline.widgets.active.command.inputField, this);
},
open: function (command) {
@@ -325,7 +319,13 @@ var CommandMode = Class("CommandMode", {
this.widgets.prompt = this.prompt;
this.widgets.command = command || "";
if (this.completions && command && options["autocomplete"].length)
if (this.historyKey)
this.history = CommandLine.History(commandline.widgets.active.command.inputField, this.historyKey, this);
if (this.complete)
this.completions = CommandLine.Completions(commandline.widgets.active.command.inputField, this);
if (this.completions && command && options["autocomplete"].length && commandline.commandSession === this)
this.completions.complete(true, false);
},
@@ -337,7 +337,7 @@ var CommandMode = Class("CommandMode", {
enter: function (stack) {
commandline.commandSession = this;
if (this.command || stack.pop && commandline.command) {
if (stack.pop && commandline.command) {
this.onChange(commandline.command);
if (this.completions && stack.pop)
this.completions.complete(true, false);

16
common/content/dactyl.js
View File

@@ -61,23 +61,27 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
"dactyl-cleanup": function dactyl_cleanup() {
let modules = dactyl.modules;
for (let name in values(Object.getOwnPropertyNames(modules).reverse())) {
let mod = Object.getOwnPropertyDescriptor(modules, name).value;
if (mod instanceof Class) {
let mods = Object.getOwnPropertyNames(modules).reverse()
.map(function (name) Object.getOwnPropertyDescriptor(modules, name).value);
for (let mod in values(mods))
if (mod instanceof ModuleBase || mod && mod.isLocalModule) {
if ("cleanup" in mod)
this.trapErrors(mod.cleanup, mod);
if ("destroy" in mod)
this.trapErrors(mod.destroy, mod);
if ("INIT" in mod && "cleanup" in mod.INIT)
this.trapErrors(mod.cleanup, mod, dactyl, modules, window);
}
}
for (let mod in values(mods))
if (mod instanceof Class && "INIT" in mod && "cleanup" in mod.INIT)
this.trapErrors(mod.cleanup, mod, dactyl, modules, window);
for (let name in values(Object.getOwnPropertyNames(modules).reverse()))
try {
delete modules[name];
}
catch (e) {}
modules.__proto__ = {};
}
},