gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-28 21:12:26 +01:00
Code Issues Projects Releases Wiki Activity

Use Object.defineProperty instead of __defineGetter__/__defineSetter__

Browse Source 
In Firefox 48+, the __defineSetter__/__defineSetter__ is deprecated,
so use Object.defineProperty instead.
This commit is contained in:
Zheng Chaoping
2016-05-04 20:00:59 +08:00
parent 1a4290d92a
commit 195ea78efb
20 changed files with 291 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
common/modules/base.jsm
View File

@@ -26,8 +26,7 @@ try {
catch (e) {}
let objproto = Object.prototype;
var { __lookupGetter__, __lookupSetter__, __defineGetter__, __defineSetter__,
hasOwnProperty, propertyIsEnumerable } = objproto;
var { hasOwnProperty, propertyIsEnumerable } = objproto;
var hasOwnProp = Function.call.bind(hasOwnProperty);
@@ -780,7 +779,7 @@ function memoize(obj, key, getter) {
if (arguments.length == 1) {
let res = update(Object.create(obj), obj);
for (let prop of Object.getOwnPropertyNames(obj)) {
let get = __lookupGetter__.call(obj, prop);
let get = Object.getOwnPropertyDescriptor(obj, prop).get;
if (get)
memoize(res, prop, get);
}
@@ -847,8 +846,12 @@ function update(target) {
let func = desc.value.wrapped || desc.value;
if (!func.superapply) {
func.__defineGetter__("super", function get_super() {
return Object.getPrototypeOf(target)[k];
Object.defineProperty(func, "super", {
get: function get_super() {
return Object.getPrototypeOf(target)[k];
},
enumerable: true,
configurable: true
});
func.superapply = function superapply(self, args) {
@@ -1169,7 +1172,11 @@ Class.prototype = {
if (typeof desc.value === "function") {
let func = desc.value.wrapped || desc.value;
if (!func.superapply) {
func.__defineGetter__("super", () => Object.getPrototypeOf(this)[k]);
Object.defineProperty(func, "super", {
get: () => Object.getPrototypeOf(this)[k],
enumerable: true,
configurable: true
});
func.superapply = function superapply(self, args) {
let meth = Object.getPrototypeOf(self)[k];
@@ -1403,11 +1410,15 @@ function Struct(...args) {
members: Ary.toObject(args.map((v, k) => [v, k])),
});
args.forEach(function (name, i) {
Struct.prototype.__defineGetter__(name, function () {
return this[i];
});
Struct.prototype.__defineSetter__(name, function (val) {
this[i] = val;
Object.defineProperty(Struct.prototype, name, {
get() {
return this[i];
},
set(val) {
this[i] = val;
},
enumerable: true,
configurable: true
});
});
return Struct;
@@ -1467,11 +1478,15 @@ var StructBase = Class("StructBase", Array, {
*/
defaultValue: function defaultValue(key, val) {
let i = this.prototype.members[key];
this.prototype.__defineGetter__(i, function () {
return this[i] = val.call(this);
});
this.prototype.__defineSetter__(i, function (value) {
return Class.replaceProperty(this, i, value);
Object.defineProperty(this.prototype, i, {
get() {
return this[i] = val.call(this);
},
set(value) {
Class.replaceProperty(this, i, value);
},
enumerable: true,
configurable: true
});
return this;
},