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

Add array indexing to macro-string processing. Checkin Minefield crash workaround that was supposed to have been checked in yesterday.

Browse Source
This commit is contained in:
Kris Maglione
2011-05-27 19:48:30 -04:00
parent 98671742c3
commit 8459d93e0b
4 changed files with 39 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
common/modules/base.jsm
View File

@@ -716,18 +716,28 @@ function Class() {
if (callable(args[0]))
superclass = args.shift();
var Constructor = eval(String.replace(<![CDATA[
(function constructor(PARAMS) {
if (loaded.util && util.haveGecko("6.0a1")) // Bug 657418.
var Constructor = function Constructor() {
var self = Object.create(Constructor.prototype, {
constructor: { value: Constructor },
});
self.instance = self;
var res = self.init.apply(self, arguments);
return res !== undefined ? res : self;
})]]>,
"constructor", (name || superclass.className).replace(/\W/g, "_"))
.replace("PARAMS", /^function .*?\((.*?)\)/.exec(args[0] && args[0].init || Class.prototype.init)[1]
.replace(/\b(self|res|Constructor)\b/g, "$1_")));
};
else
var Constructor = eval(String.replace(<![CDATA[
(function constructor(PARAMS) {
var self = Object.create(Constructor.prototype, {
constructor: { value: Constructor },
});
self.instance = self;
var res = self.init.apply(self, arguments);
return res !== undefined ? res : self;
})]]>,
"constructor", (name || superclass.className).replace(/\W/g, "_"))
.replace("PARAMS", /^function .*?\((.*?)\)/.exec(args[0] && args[0].init || Class.prototype.init)[1]
.replace(/\b(self|res|Constructor)\b/g, "$1_")));
Constructor.className = name || superclass.className || superclass.name;