antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 9 Projects Releases 5 Activity Actions

Merged with helma/master

Browse source
This commit is contained in:
Tobi Schäfer 2013-04-07 17:27:18 +02:00
parent ff7bba76cf
commit 59d127e089
11 changed files with 75 additions and 241 deletions
Download patch file Download diff file Expand all files Collapse all files

74
modules/core/Object.js
View file

@ -17,7 +17,7 @@
/**
* @fileoverview Adds useful methods to the JavaScript Object type.
* <br /><br />
* To use this optional module, its repository needs to be added to the
* To use this optional module, its repository needs to be added to the
* application, for example by calling app.addRepository('modules/core/Object.js')
*/
@ -30,42 +30,43 @@
*/
Object.prototype.clone = function(clone, recursive) {
var getValue = function(value, recursive) {
if ((value == null || typeof(value) !== "object") || recursive !== true) {
return value;
}
return value.clone(null, recursive);
};
var getValue = function(value, recursive) {
if (recursive !== true || value == null
|| (typeof (value) !== "object" && typeof (value) !== "function")) {
return value;
}
return value.clone(null, recursive);
};
if (typeof(this) === "object") {
switch (this.constructor) {
case Array:
return this.map(function(value) {
return getValue(value, recursive);
});
if (typeof (this) === "object") {
if (this === null) {
return null;
}
switch (this.constructor) {
case String:
case Number:
case Boolean:
case Date:
return new this.constructor(this.valueOf());
case null: // e.g. macro parameter objects
if (clone == null) {
clone = {};
}
// continue below
case Object:
case HopObject:
if (clone == null) {
clone = new this.constructor();
}
for (var propName in this) {
clone[propName] = getValue(this[propName], recursive);
}
return clone;
case Array:
return this.map(function(value) {
return getValue(value, recursive);
});
default:
return new this.constructor(this.valueOf());
}
} else if (typeof(this) === "function" && this.constructor === RegExp) {
return new RegExp(this.valueOf());
}
return this;
default:
if (clone == null) {
clone = new this.constructor();
}
for ( var propName in this) {
clone[propName] = getValue(this[propName], recursive);
}
return clone;
}
} else if (typeof (this) === "function" && this.constructor === RegExp) {
return new RegExp(this.valueOf());
}
return this;
};
@ -78,11 +79,10 @@ Object.prototype.clone = function(clone, recursive) {
Object.prototype.reduce = function(recursive) {
var result = {};
for (var i in this) {
if (this[i] instanceof HopObject == false) {
if (this[i] instanceof HopObject == false)
result[i] = this[i];
} else if (recursive) {
else if (recursive)
result[i] = this.reduce(true);
}
}
return result;
};