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

Minor cleanup.

Browse Source
This commit is contained in:
Kris Maglione
2011-09-13 15:16:37 -04:00
parent 50f0901412
commit 9f4b3ec3a7
1 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
common/modules/util.jsm
View File

@@ -119,8 +119,10 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
if (!obj.observers) if (!obj.observers)
obj.observers = obj.observe; obj.observers = obj.observe;
let cleanup = ["dactyl-cleanup-modules", "quit-application"];
function register(meth) { function register(meth) {
for (let target in Set(["dactyl-cleanup-modules", "quit-application"].concat(Object.keys(obj.observers)))) for (let target in Set(cleanup.concat(Object.keys(obj.observers))))
try { try {
services.observer[meth](obj, target, true); services.observer[meth](obj, target, true);
} }
@@ -130,7 +132,7 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
Class.replaceProperty(obj, "observe", Class.replaceProperty(obj, "observe",
function (subject, target, data) { function (subject, target, data) {
try { try {
if (target == "quit-application" || target == "dactyl-cleanup-modules") if (!cleanup.indexOf(target))
register("removeObserver"); register("removeObserver");
if (obj.observers[target]) if (obj.observers[target])
obj.observers[target].call(obj, subject, data); obj.observers[target].call(obj, subject, data);
@@ -540,22 +542,6 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
return delimiter + str.replace(/([\\'"])/g, "\\$1").replace("\n", "\\n", "g").replace("\t", "\\t", "g") + delimiter; return delimiter + str.replace(/([\\'"])/g, "\\$1").replace("\n", "\\n", "g").replace("\t", "\\t", "g") + delimiter;
}, },
extend: function extend(dest) {
Array.slice(arguments, 1).filter(util.identity).forEach(function (src) {
for (let [k, v] in Iterator(src)) {
let get = src.__lookupGetter__(k),
set = src.__lookupSetter__(k);
if (!get && !set)
dest[k] = v;
if (get)
dest.__defineGetter__(k, get);
if (set)
dest.__defineSetter__(k, set);
}
});
return dest;
},
/** /**
* Converts *bytes* to a pretty printed data size string. * Converts *bytes* to a pretty printed data size string.
* *