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

Move defineProperty from ZU.Internal to Zotero

Browse source
This commit is contained in:
Aurimas Vinckevicius 2014-11-14 02:06:22 -06:00
parent aca15c0d2d
commit d4bd0ee811
4 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
chrome/content/zotero/xpcom/data/dataObject.js
View file

@ -55,17 +55,17 @@ Zotero.DataObject = function () {
Zotero.DataObject.prototype._objectType = 'dataObject'; Zotero.DataObject.prototype._objectType = 'dataObject';
Zotero.DataObject.prototype._dataTypes = []; Zotero.DataObject.prototype._dataTypes = [];
Zotero.Utilities.Internal.defineProperty(Zotero.DataObject.prototype, 'objectType', { Zotero.defineProperty(Zotero.DataObject.prototype, 'objectType', {
get: function() this._objectType get: function() this._objectType
}); });
Zotero.Utilities.Internal.defineProperty(Zotero.DataObject.prototype, 'libraryKey', { Zotero.defineProperty(Zotero.DataObject.prototype, 'libraryKey', {
get: function() this._libraryID + "/" + this._key get: function() this._libraryID + "/" + this._key
}); });
Zotero.Utilities.Internal.defineProperty(Zotero.DataObject.prototype, 'parentKey', { Zotero.defineProperty(Zotero.DataObject.prototype, 'parentKey', {
get: function() this._parentKey, get: function() this._parentKey,
set: function(v) this._setParentKey(v) set: function(v) this._setParentKey(v)
}); });
Zotero.Utilities.Internal.defineProperty(Zotero.DataObject.prototype, 'parentID', { Zotero.defineProperty(Zotero.DataObject.prototype, 'parentID', {
get: function() this._getParentID(), get: function() this._getParentID(),
set: function(v) this._setParentID(v) set: function(v) this._setParentID(v)
}); });

2
chrome/content/zotero/xpcom/data/libraries.js
View file

@ -28,7 +28,7 @@ Zotero.Libraries = new function () {
_userLibraryID, _userLibraryID,
_libraryDataLoaded = false; _libraryDataLoaded = false;
Zotero.Utilities.Internal.defineProperty(this, 'userLibraryID', { Zotero.defineProperty(this, 'userLibraryID', {
get: function() { get: function() {
if (!_libraryDataLoaded) { if (!_libraryDataLoaded) {
throw new Error("Library data not yet loaded"); throw new Error("Library data not yet loaded");

18
chrome/content/zotero/xpcom/utilities_internal.js
View file

@ -493,24 +493,6 @@ Zotero.Utilities.Internal = {
}, 0, 0, null); }, 0, 0, null);
return pipe.inputStream; return pipe.inputStream;
},
/**
* 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
*/
"defineProperty": function(obj, prop, desc) {
if (typeof prop != 'string') throw new Error("Property must be a string");
var d = { __proto__: null, enumerable: true }; // Enumerable by default
for (let p in desc) {
if (!desc.hasOwnProperty(p)) continue;
d[p] = desc[p];
}
Object.defineProperty(obj, prop, d);
} }
} }

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

@ -1400,6 +1400,24 @@ 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
*/
this.defineProperty = function(obj, prop, desc) {
if (typeof prop != 'string') throw new Error("Property must be a string");
var d = { __proto__: null, enumerable: true }; // Enumerable by default
for (let p in desc) {
if (!desc.hasOwnProperty(p)) continue;
d[p] = desc[p];
}
Object.defineProperty(obj, prop, d);
}
/* /*
* This function should be removed * This function should be removed
* *