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

Minor fixes/cleanup for last commit.

Browse Source
This commit is contained in:
Kris Maglione
2011-02-14 17:57:06 -05:00
parent 0f8116aea1
commit 6e22507d69
1 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
common/content/commandline.js
View File

@@ -260,20 +260,15 @@ var CommandWidgets = Class("CommandWidgets", {
["viewable", "complete"].indexOf(elem.contentDocument.readyState) >= 0; ["viewable", "complete"].indexOf(elem.contentDocument.readyState) >= 0;
}, },
_whenReady: function _whenReady(id) { _whenReady: function _whenReady(id, init) {
let elem = document.getElementById(id); let elem = document.getElementById(id);
util.waitFor(bind(this._ready, this, elem));
return elem;
},
completionList: Class.memoize(function () {
let elem = document.getElementById(elem);
while (!this._ready(elem)) while (!this._ready(elem))
yield 10; yield 10;
if (init)
init.call(this, elem);
yield elem; yield elem;
}, true), },
completionContainer: Class.memoize(function () this.completionList.parentNode), completionContainer: Class.memoize(function () this.completionList.parentNode),
@@ -287,16 +282,11 @@ var CommandWidgets = Class("CommandWidgets", {
return document.getElementById("dactyl-contextmenu"); return document.getElementById("dactyl-contextmenu");
}), }),
multilineOutput: Class.memoize(function () { multilineOutput: Class.memoize(function () this._whenReady("dactyl-multiline-output", function (elem) {
let elem = document.getElementById("dactyl-multiline-output");
while (!this._ready(elem))
yield 10;
elem.contentWindow.addEventListener("unload", function (event) { event.preventDefault(); }, true); elem.contentWindow.addEventListener("unload", function (event) { event.preventDefault(); }, true);
elem.contentDocument.documentElement.id = "dactyl-multiline-output-top"; elem.contentDocument.documentElement.id = "dactyl-multiline-output-top";
elem.contentDocument.body.id = "dactyl-multiline-output-content"; elem.contentDocument.body.id = "dactyl-multiline-output-content";
yield elem; }), true),
}, true),
multilineInput: Class.memoize(function () document.getElementById("dactyl-multiline-input")), multilineInput: Class.memoize(function () document.getElementById("dactyl-multiline-input")),
@@ -581,7 +571,9 @@ var CommandLine = Module("commandline", {
get completionList() { get completionList() {
let node = this.widgets.active.commandline; let node = this.widgets.active.commandline;
if (!node.completionList) { if (!node.completionList) {
let elem = this.widgets._whenReady("dactyl-completions-" + node.id); let elem = document.getElementById("dactyl-completions-" + node.id);
util.waitFor(bind(this.widgets._ready, null, elem));
node.completionList = ItemList(elem.id); node.completionList = ItemList(elem.id);
} }
return node.completionList; return node.completionList;