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:
Kaveh Vahedipour 2016-08-03 13:13:54 +02:00
parent fde28d1a61 799ccbc765
commit 2062e84ceb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1473,7 +1473,7 @@ global.DEFINE_MODULE('internal', (function () {
if (typeof src !== 'function' || (
key !== 'arguments' && key !== 'caller' && key !== 'callee'
)) {
if (key.charAt(0) !== '_' && !hasOwnProperty(result, key)) {
if (key.charAt(0) !== '_' && !hasOwnProperty.call(result, key)) {
val = obj[key];
if (seen.indexOf(val) !== -1 && (
typeof val === 'object' || typeof val === 'function'
@ -1491,7 +1491,7 @@ global.DEFINE_MODULE('internal', (function () {
if (obj.constructor && obj.constructor.name) {
if (obj instanceof Error && obj.name === Error.name) {
result.name = obj.constructor.name;
} else if (!hasOwnProperty(result, 'constructor')) {
} else if (!hasOwnProperty.call(result, 'constructor')) {
result.constructor = {
name: obj.constructor.name
};