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

Fix some initialization order issues.

Browse Source
This commit is contained in:
Kris Maglione
2011-03-09 03:49:38 -05:00
parent dfd7398a4f
commit cc73345c71
6 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/content/commandline.js
View File

@@ -1390,7 +1390,7 @@ var CommandLine = Module("commandline", {
subCommand: 0 subCommand: 0
}); });
}, },
modes: function () { modes: function initModes() {
modes.addMode("COMMAND_LINE", { modes.addMode("COMMAND_LINE", {
char: "c", char: "c",
description: "Active when the command line is focused", description: "Active when the command line is focused",

3
common/content/hints.js
View File

@@ -1115,7 +1115,8 @@ var Hints = Module("hints", {
Mode: Struct("HintMode", "name", "prompt", "action", "tags", "filter") Mode: Struct("HintMode", "name", "prompt", "action", "tags", "filter")
.localize("prompt") .localize("prompt")
}, { }, {
modes: function () { modes: function initModes() {
initModes.require("commandline");
modes.addMode("HINTS", { modes.addMode("HINTS", {
extended: true, extended: true,
description: "Active when selecting elements in QuickHint or ExtendedHint mode", description: "Active when selecting elements in QuickHint or ExtendedHint mode",

4
common/content/modes.js
View File

@@ -426,6 +426,10 @@ var Modes = Module("modes", {
}, { }, {
Mode: Class("Mode", { Mode: Class("Mode", {
init: function init(name, options, params) { init: function init(name, options, params) {
if (options.bases)
util.assert(options.bases.every(function (m) m instanceof this, this.constructor),
"Invalid bases", true);
update(this, { update(this, {
id: 1 << Modes.Mode._id++, id: 1 << Modes.Mode._id++,
name: name, name: name,

3
common/modules/io.jsm
View File

@@ -996,7 +996,8 @@ unlet s:cpo_save
}]); }]);
}, },
modes: function (dactyl, modules, window) { modes: function initModes(dactyl, modules, window) {
initModes.require("commandline");
const { modes } = modules; const { modes } = modules;
modes.addMode("FILE_INPUT", { modes.addMode("FILE_INPUT", {

1
common/modules/javascript.jsm
View File

@@ -700,6 +700,7 @@ var JavaScript = Module("javascript", {
}); });
}, },
modes: function initModes(dactyl, modules, window) { modes: function initModes(dactyl, modules, window) {
initModes.require("commandline");
const { modes } = modules; const { modes } = modules;
modes.addMode("REPL", { modes.addMode("REPL", {

5
common/modules/util.jsm
View File

@@ -931,7 +931,10 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
let docShells = window.docShell.getDocShellEnumerator(Ci.nsIDocShellTreeItem[type], let docShells = window.docShell.getDocShellEnumerator(Ci.nsIDocShellTreeItem[type],
Ci.nsIDocShell.ENUMERATE_FORWARDS); Ci.nsIDocShell.ENUMERATE_FORWARDS);
while (docShells.hasMoreElements()) while (docShells.hasMoreElements())
yield docShells.getNext().QueryInterface(Ci.nsIDocShell).contentViewer.DOMDocument; let (viewer = docShells.getNext().QueryInterface(Ci.nsIDocShell).contentViewer) {
if (viewer)
yield viewer.DOMDocument;
}
} }
} }
}, },