gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-03-04 13:25:45 +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

36
common/content/dactyl.js
View File

@@ -61,19 +61,15 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
"dactyl-cleanup": function dactyl_cleanup() {
let modules = dactyl.modules;
let mods = Object.getOwnPropertyNames(modules).reverse()
.map(function (name) Object.getOwnPropertyDescriptor(modules, name).value);
for (let mod in values(modules.moduleList.reverse())) {
mod.stale = true;
if ("cleanup" in mod)
this.trapErrors("cleanup", mod);
if ("destroy" in mod)
this.trapErrors("destroy", mod);
}
for (let mod in values(mods))
if (mod instanceof ModuleBase || mod && mod.isLocalModule) {
mod.stale = true;
if ("cleanup" in mod)
this.trapErrors("cleanup", mod);
if ("destroy" in mod)
this.trapErrors("destroy", mod);
}
for (let mod in values(mods))
for (let mod in values(modules.ownPropertyValues.reverse()))
if (mod instanceof Class && "INIT" in mod && "cleanup" in mod.INIT)
this.trapErrors(mod.cleanup, mod, dactyl, modules, window);
@@ -145,20 +141,24 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
postCommands: null
},
registerObserver: function (type, callback, weak) {
registerObserver: function registerObserver(type, callback, weak) {
if (!(type in this._observers))
this._observers[type] = [];
this._observers[type].push(weak ? Cu.getWeakReference(callback) : { get: function () callback });
},
unregisterObserver: function (type, callback) {
registerObservers: function registerObservers(obj, prop) {
for (let [signal, func] in Iterator(obj[prop || "signals"]))
this.registerObserver(signal, obj.closure(func), false);
},
unregisterObserver: function unregisterObserver(type, callback) {
if (type in this._observers)
this._observers[type] = this._observers[type].filter(function (c) c.get() != callback);
},
// TODO: "zoom": if the zoom value of the current buffer changed
triggerObserver: function (type) {
let args = Array.slice(arguments, 1);
applyTriggerObserver: function triggerObserver(type, args) {
if (type in this._observers)
this._observers[type] = this._observers[type].filter(function (callback) {
if (callback.get()) {
@@ -179,6 +179,10 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
});
},
triggerObserver: function triggerObserver(type) {
return this.applyTriggerObserver(type, Array.slice(arguments, 1));
},
addUsageCommand: function (params) {
let name = commands.add(params.name, params.description,
function (args) {