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

Import minor changes from groups branch.

Browse Source
This commit is contained in:
Kris Maglione
2011-02-05 03:11:21 -05:00
parent e9fd99dafa
commit 1af39e6424
12 changed files with 49 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
common/modules/base.jsm
View File

@@ -616,12 +616,12 @@ function update(target) {
if (desc.value instanceof Class.Property)
desc = desc.value.init(k) || desc.value;
if (typeof desc.value == "function" && Object.getPrototypeOf(target)) {
let func = desc.value;
desc.value.__defineGetter__("super", function () Object.getPrototypeOf(target)[k]);
desc.value.superapply = function superapply(self, args)
let func = desc.value.wrapped || desc.value;
func.__defineGetter__("super", function () Object.getPrototypeOf(target)[k]);
func.superapply = function superapply(self, args)
let (meth = Object.getPrototypeOf(target)[k])
meth && meth.apply(self, args);
desc.value.supercall = function supercall(self)
func.supercall = function supercall(self)
func.superapply(self, Array.slice(arguments, 1));
}
Object.defineProperty(target, k, desc);
@@ -663,7 +663,7 @@ function Class() {
superclass = args.shift();
var Constructor = eval(String.replace(<![CDATA[
(function constructor() {
(function constructor(PARAMS) {
var self = Object.create(Constructor.prototype, {
constructor: { value: Constructor },
});
@@ -671,7 +671,9 @@ function Class() {
var res = self.init.apply(self, arguments);
return res !== undefined ? res : self;
})]]>,
"constructor", (name || superclass.className).replace(/\W/g, "_")));
"constructor", (name || superclass.className).replace(/\W/g, "_"))
.replace("PARAMS", /^function .*?\((.*?)\)/.exec(args[0] && args[0].init || Class.prototype.init)[1]));
Constructor.className = name || superclass.className || superclass.name;
if ("init" in superclass.prototype)