mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove duplicate Zotero.defineProperty() function

Browse source 
Ended up in two places somehow
This commit is contained in:
Dan Stillman 2015-05-13 11:45:45 -04:00
parent 27ab9869be
commit f376db0705
1 changed files with 7 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
chrome/content/zotero/xpcom/zotero.js
View file

@ -1435,6 +1435,13 @@ Components.utils.import("resource://gre/modules/osfile.jsm");
Object.defineProperty(obj, prop, d);
}
this.extendClass = function(superClass, newClass) {
newClass._super = superClass;
newClass.prototype = Object.create(superClass.prototype);
newClass.prototype.constructor = newClass;
}
/*
* This function should be removed
*
@ -1620,46 +1627,6 @@ Components.utils.import("resource://gre/modules/osfile.jsm");
}
/**
* Defines property on the object
* More compact way to do Object.defineProperty
*
* @param {Object} obj Target object
* @param {String} prop Property to be defined
* @param {Object} desc Propery descriptor. If not overriden, "enumerable" is true
* @param {Object} opts Options:
* lateInit {Boolean} If true, the _getter_ is intended for late
* initialization of the property. The getter is replaced with a simple
* property once initialized.
*/
this.defineProperty = function(obj, prop, desc, opts) {
if (typeof prop != 'string') throw new Error("Property must be a string");
var d = { __proto__: null, enumerable: true, configurable: true }; // Enumerable by default
for (let p in desc) {
if (!desc.hasOwnProperty(p)) continue;
d[p] = desc[p];
}
if (opts) {
if (opts.lateInit && d.get) {
let getter = d.get;
d.get = function() {
var val = getter.call(this);
this[prop] = val; // Replace getter with value
return val;
}
}
}
Object.defineProperty(obj, prop, d);
}
this.extendClass = function(superClass, newClass) {
newClass._super = superClass;
newClass.prototype = Object.create(superClass.prototype);
newClass.prototype.constructor = newClass;
}
/**
* Allow other events (e.g., UI updates) on main thread to be processed if necessary
*