gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-03-29 08:03:35 +02:00
Code Issues Projects Releases Wiki Activity

Probably fix a race in completion list generation after :rehash.

Browse Source 
--HG--
extra : rebase_source : d5bf5ae963dab35a624d4a85089e372174b39168
This commit is contained in:
Kris Maglione
2010-12-30 18:25:33 -05:00
parent ebc1563d08
commit 71747b1423
1 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
common/content/commandline.js
View File

@@ -247,18 +247,25 @@ var CommandWidgets = Class("CommandWidgets", {
activeGroup: Class.memoize(Object), activeGroup: Class.memoize(Object),
commandbar: Class.memoize(function () ({ group: "Cmd" })), commandbar: Class.memoize(function () ({ group: "Cmd" })),
statusbar: Class.memoize(function () ({ group: "Status" })), statusbar: Class.memoize(function () ({ group: "Status" })),
completionList: Class.memoize(function () document.getElementById("dactyl-completions")),
completionContainer: Class.memoize(function () this.completionList.parentNode),
multilineOutput: Class.memoize(function () {
this.__defineGetter__("multilineOutput", function () {
let elem = document.getElementById("dactyl-multiline-output");
while (elem.contentDocument.documentURI != elem.getAttribute("src") ||
["viewable", "complete"].indexOf(elem.contentDocument.readyState) < 0)
util.threadYield();
return elem;
});
let elem = this.multilineOutput; _whenReady: function (name, id, processor) {
Object.defineProperty(this, name, {
configurable: true, enumerable: true,
get: function () {
let elem = document.getElementById(id);
while (elem.contentDocument.documentURI != elem.getAttribute("src") ||
["viewable", "complete"].indexOf(elem.contentDocument.readyState) < 0)
util.threadYield();
return elem;
}
});
return Class.replaceProperty(this, name, (processor || util.identity).call(this, this[name]))
},
get completionList() this._whenReady("completionList", "dactyl-completions"),
completionContainer: Class.memoize(function () this.completionList.parentNode),
get multilineOutput() this._whenReady("multilineOutput", "dactyl-multiline-output",
function (elem) {
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";
@@ -380,7 +387,8 @@ var CommandLine = Module("commandline", {
this.__defineGetter__("_completionList", function () { this.__defineGetter__("_completionList", function () {
let node = this.widgets.active.commandline; let node = this.widgets.active.commandline;
if (!node._completionList) if (!node._completionList)
node._completionList = ItemList("dactyl-completions-" + node.id); this.widgets._whenReady.call(node, "_completionList", "dactyl-completions-" + node.id,
function (node) ItemList(node.id));
return node._completionList; return node._completionList;
}); });
this._completions = null; this._completions = null;