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

Fix config.addon bug and augment Class.memoize somewhat.

Browse Source
This commit is contained in:
Kris Maglione
2011-02-14 16:47:57 -05:00
parent 9ef146b93b
commit 0a008b6a51
3 changed files with 40 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
common/content/commandline.js
View File

@@ -255,24 +255,16 @@ var CommandWidgets = Class("CommandWidgets", {
commandbar: Class.memoize(function () ({ group: "Cmd" })),
statusbar: Class.memoize(function () ({ group: "Status" })),
_whenReady: function _whenReady(name, id, processor) {
Object.defineProperty(this, name, {
configurable: true, enumerable: true,
get: function get_whenReady() {
let elem = document.getElementById(id);
_whenReady: function _whenReady(name, id) {
let elem = document.getElementById(id);
util.waitFor(function () elem.contentDocument.documentURI === elem.getAttribute("src") &&
["viewable", "complete"].indexOf(elem.contentDocument.readyState) >= 0);
util.waitFor(function () elem.contentDocument.documentURI === elem.getAttribute("src") &&
["viewable", "complete"].indexOf(elem.contentDocument.readyState) >= 0);
res = res || (processor || util.identity).call(self, elem);
return res;
}
});
let res, self = this;
return Class.replaceProperty(this, name, this[name]);
return elem;
},
get completionList() this._whenReady("completionList", "dactyl-completions"),
completionList: Class.memoize(function () this._whenReady("completionList", "dactyl-completions"), true),
completionContainer: Class.memoize(function () this.completionList.parentNode),
@@ -286,13 +278,13 @@ var CommandWidgets = Class("CommandWidgets", {
return document.getElementById("dactyl-contextmenu");
}),
get multilineOutput() this._whenReady("multilineOutput", "dactyl-multiline-output",
function (elem) {
multilineOutput: Class.memoize(function () {
let elem = this._whenReady("multilineOutput", "dactyl-multiline-output");
elem.contentWindow.addEventListener("unload", function (event) { event.preventDefault(); }, true);
elem.contentDocument.documentElement.id = "dactyl-multiline-output-top";
elem.contentDocument.body.id = "dactyl-multiline-output-content";
return elem;
}),
}, true),
multilineInput: Class.memoize(function () document.getElementById("dactyl-multiline-input")),
@@ -576,9 +568,10 @@ var CommandLine = Module("commandline", {
get completionList() {
let node = this.widgets.active.commandline;
if (!node.completionList)
this.widgets._whenReady.call(node, "completionList", "dactyl-completions-" + node.id,
function (node) ItemList(node.id));
if (!node.completionList) {
let elem = this.widgets._whenReady("completionList", "dactyl-completions-" + node.id);
node.completionList = ItemList(elem.id);
}
return node.completionList;
},