gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-02-14 06:45:51 +01:00
Code Issues Projects Releases Wiki Activity

Move some event-based code into observers in the modules it affects.

Browse Source
This commit is contained in:
Kris Maglione
2011-02-27 16:58:21 -05:00
parent 191ece33e0
commit 74fbc5833f
10 changed files with 159 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
common/modules/base.jsm
View File

@@ -983,6 +983,9 @@ Module.INIT = {
locals.reverse().forEach(function (fn, i) update(objs[i], fn.apply(module, args)))
module.instance = module;
module.init();
if (module.signals)
modules.dactyl.registerObservers
}
}
}

6
common/modules/contexts.jsm
View File

@@ -125,6 +125,12 @@ var Contexts = Module("contexts", {
util.trapErrors("onUnload", plugin);
},
signals: {
"browser.locationChange": function (webProgress, request, uri) {
this.flush();
}
},
Group: Class("Group", Group, { modules: modules, get hiveMap() modules.contexts.hives }),
Hives: Class("Hives", Class.Property, {

28
common/modules/overlay.jsm
View File

@@ -79,6 +79,7 @@ var Overlay = Module("Overlay", {
const module = Class(name, base, prototype, classProperties);
module.INIT = moduleInit || {};
module.modules = modules;
module.prototype.INIT = module.INIT;
module.requires = prototype.requires || [];
Module.list.push(module);
@@ -143,7 +144,13 @@ var Overlay = Module("Overlay", {
sandbox.Math = jsmodules.Math;
sandbox.__proto__ = proto || modules;
return sandbox;
}
},
get ownPropertyValues() array.compact(
Object.getOwnPropertyNames(this)
.map(function (name) Object.getOwnPropertyDescriptor(this, name).value, this)),
get moduleList() this.ownPropertyValues.filter(function (mod) mod instanceof this.ModuleBase || mod.isLocalModule, this)
});
modules.plugins = create(modules);
modules.modules = modules;
@@ -228,6 +235,9 @@ var Overlay = Module("Overlay", {
Class.replaceProperty(modules, module.className, obj);
loaded[module.className] = true;
if (loaded.dactyl && obj.signals)
modules.dactyl.registerObservers(obj);
frob(module.className);
}
catch (e) {
@@ -258,7 +268,8 @@ var Overlay = Module("Overlay", {
delete modules[mod.className];
return load(mod.className, null, Components.stack.caller);
});
Object.keys(mod.prototype.INIT).forEach(function (name) { deferInit(name, mod.prototype.INIT, mod); });
Object.keys(mod.prototype.INIT)
.forEach(function (name) { deferInit(name, mod.prototype.INIT, mod); });
}
mod.frobbed = true;
});
@@ -300,15 +311,12 @@ var Overlay = Module("Overlay", {
modules.events.listen(window, "unload", function onUnload() {
window.removeEventListener("unload", onUnload.wrapped, false);
for (let prop in properties(modules)) {
let mod = Object.getOwnPropertyDescriptor(modules, prop).value;
util.dump("unload", modules.moduleList);
for each (let mod in modules.moduleList.reverse()) {
mod.stale = true;
if (mod instanceof ModuleBase || mod && mod.isLocalModule) {
mod.stale = true;
if ("destroy" in mod)
util.trapErrors("destroy", mod);
}
if ("destroy" in mod)
util.trapErrors("destroy", mod);
}
}, false);
}

11
common/modules/util.jsm
View File

@@ -1645,6 +1645,17 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
wrapCallback: wrapCallback,
/**
* Returns the top-level chrome window for the given window.
*
* @param {Window} win The child window.
* @returns {Window} The top-level parent window.
*/
topWindow: function topWindow(win)
win.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIWebNavigation)
.QueryInterface(Ci.nsIDocShellTreeItem).rootTreeItem
.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindow),
/**
* Traps errors in the called function, possibly reporting them.
*