Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of https://github.com/arangodb/arangodb into devel

This commit is contained in:
jsteemann 2016-05-02 17:43:06 +02:00
parent f48e9b3a18 3fb6d517f7
commit 3cd4a1d186
3 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/common/bootstrap/modules/internal.js
View File

@ -1726,6 +1726,10 @@ if (typeof SYS_OPTIONS !== 'undefined') {
delete global.SYS_OPTIONS;
}
exports.propertyKeys = (obj) => Object.keys(obj).filter((key) => {
return (key.charAt(0) !== '_' && key.charAt(0) !== '$');
});
////////////////////////////////////////////////////////////////////////////////
/// @brief print

18
js/common/bootstrap/monkeypatches.js
View File

@ -38,26 +38,12 @@
Object.defineProperty(Object.prototype, '_shallowCopy', {
get() {
var self = this;
return this.propertyKeys.reduce(function (previous, key) {
previous[key] = self[key];
return require('internal').propertyKeys(this).reduce((previous, key) => {
previous[key] = this[key];
return previous;
}, {});
}
});
////////////////////////////////////////////////////////////////////////////////
/// @brief returns the property keys
////////////////////////////////////////////////////////////////////////////////
Object.defineProperty(Object.prototype, 'propertyKeys', {
get() {
return Object.keys(this).filter(function (key) {
return (key.charAt(0) !== '_' && key.charAt(0) !== '$');
});
}
});
}());

5
js/common/modules/@arangodb/graph-common.js
View File

@ -28,6 +28,7 @@
////////////////////////////////////////////////////////////////////////////////
var is = require("@arangodb/is"),
internal = require("internal"),
Edge,
Graph,
Vertex,
@ -244,7 +245,7 @@ Edge.prototype.getProperty = function (name) {
////////////////////////////////////////////////////////////////////////////////
Edge.prototype.getPropertyKeys = function () {
return this._properties.propertyKeys;
return internal.propertyKeys(this._properties);
};
////////////////////////////////////////////////////////////////////////////////
@ -431,7 +432,7 @@ Vertex.prototype.getProperty = function (name) {
////////////////////////////////////////////////////////////////////////////////
Vertex.prototype.getPropertyKeys = function () {
return this._properties.propertyKeys;
return internal.propertyKeys(this._properties);
};
////////////////////////////////////////////////////////////////////////////////