gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-30 19:22:28 +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

24
common/modules/storage.jsm
View File

@@ -31,8 +31,20 @@ var StoreBase = Class("StoreBase", {
this._load = load;
this._options = options;
this.__defineGetter__("store", () => store);
this.__defineGetter__("name", () => name);
Object.defineProperties(this, {
"store": {
value: store,
writable: false,
enumerable: true,
configurable: true,
},
"name": {
value: name,
writable: false,
enumerable: true,
configurable: true,
}
});
for (let [k, v] of iter(options))
if (this.OPTIONS.indexOf(k) >= 0)
this[k] = v;
@@ -301,8 +313,12 @@ var Storage = Module("Storage", {
this.keys[key] = new constructor(key, params.store, load, params);
this.keys[key].timer = new Timer(1000, 10000, () => this.save(key));
this.__defineGetter__(key, function () {
return this.keys[key];
Object.defineProperty(this, key, {
get() {
return this.keys[key];
},
enumerable: true,
configurable: true,
});
}
return this.keys[key];