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

[bootstrap] Merge default.

Browse Source 
--HG--
branch : bootstrapped
This commit is contained in:
Kris Maglione
2010-12-27 00:34:19 -05:00
parent 0bd5210910 f2bcfa99ea
commit 15b2909bc1
11 changed files with 153 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
common/modules/base.jsm
View File

@@ -10,7 +10,6 @@ if (!JSMLoader)
globals: {},
stale: {},
load: function load(url, target) {
dump("dactyl: load: " + url + "\n");
if (this.stale[url]) {
delete this.stale[url];
let global = this.globals[url];
@@ -26,7 +25,6 @@ if (!JSMLoader)
Components.classes["@mozilla.org/moz/jssubscript-loader;1"]
.getService(Components.interfaces.mozIJSSubScriptLoader)
.loadSubScript(url, global);
dump("dactyl: load reloaded: " + url + "\n");
}
Components.utils.import(url, target);
},
@@ -296,7 +294,10 @@ function deprecated(reason, fn) {
(obj ? obj + "." : "") + (fn.name || name) + " is deprecated: " + reason);
return func.apply(this, arguments);
}
deprecatedMethod.seen = { "chrome://dactyl/content/javascript.js": true };
deprecatedMethod.seen = {
"chrome://dactyl/content/javascript.js": true,
"resource://dactyl/util.jsm": true
};
return callable(fn) ? deprecatedMethod : Class.Property({
get: function () deprecatedMethod,
@@ -692,10 +693,11 @@ function update(target) {
desc = desc.value.init(k) || desc.value;
if (typeof desc.value == "function" && Object.getPrototypeOf(target)) {
let func = desc.value;
desc.value.superapply = function (self, args)
desc.value.__defineGetter__("super", function () Object.getPrototypeOf(target)[k]);
desc.value.superapply = function superapply(self, args)
let (meth = Object.getPrototypeOf(target)[k])
meth && meth.apply(self, args);
desc.value.supercall = function (self)
desc.value.supercall = function supercall(self)
func.superapply(self, Array.slice(arguments, 1));
}
Object.defineProperty(target, k, desc);

21
common/modules/util.jsm
View File

@@ -1020,6 +1020,27 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
}), true);
},
overlayObject: function (object, overrides) {
let original = Object.create(object);
overrides = update(Object.create(original), overrides);
for each (let k in Object.getOwnPropertyNames(overrides)) {
let orig, desc = Object.getOwnPropertyDescriptor(overrides, k);
if (desc.value instanceof Class.Property)
desc = desc.value.init(k) || desc.value;
for (let obj = object; obj && !orig; obj = Object.getPrototypeOf(obj))
if (orig = Object.getOwnPropertyDescriptor(obj, k))
Object.defineProperty(original, k, orig);
Object.defineProperty(object, k, desc);
}
return function unwrap() {
for each (let k in Object.getOwnPropertyNames(original))
Object.defineProperty(object, k, Object.getOwnPropertyDescriptor(original, k));
}
},
overlayWindow: function (url, fn) {
if (url instanceof Ci.nsIDOMWindow)
util._loadOverlay(url, fn);