Merge pull request #593 from megawac/helpers

Helpers
This commit is contained in:
Jürg Lehni 2015-08-21 15:53:06 +02:00
commit 8f9e0f58fa

View file

@ -77,18 +77,18 @@ Base.inject(/** @lends Base# */{
* @return {Boolean} {@true if the object is a plain object} * @return {Boolean} {@true if the object is a plain object}
*/ */
_set: function(props, exclude, dontCheck) { _set: function(props, exclude, dontCheck) {
if (props && (dontCheck || Base.isPlainObject(props))) { if (dontCheck || Base.isPlainObject(props)) {
// If props is a filtering object, we need to execute hasOwnProperty // If props is a filtering object, we need to execute hasOwnProperty
// on the original object (it's parent / prototype). See _filtered // on the original object (it's parent / prototype). See _filtered
// inheritance trick in the argument reading code. // inheritance trick in the argument reading code.
var orig = props._filtering || props; var keys = Object.keys(props._filtering || props);
for (var key in orig) { for (var i = 0; i < keys.length; i++) {
if (orig.hasOwnProperty(key) && !(exclude && exclude[key])) { var key = keys[i];
var value = props[key]; if (!(exclude && exclude[key])) {
// Due to the _filtered inheritance trick, undefined is used // Due to the _filtered inheritance trick, undefined is used
// to mask already consumed named arguments. // to mask already consumed named arguments.
if (value !== undefined) if (props[key] !== undefined)
this[key] = value; this[key] = props[key];
} }
} }
return true; return true;
@ -380,10 +380,10 @@ Base.inject(/** @lends Base# */{
res._compact = true; res._compact = true;
} else if (Base.isPlainObject(obj)) { } else if (Base.isPlainObject(obj)) {
res = {}; res = {};
for (var i in obj) for (var keys = Object.keys(obj), i = 0; i < keys.length; i++) {
if (obj.hasOwnProperty(i)) var key = keys[i];
res[i] = Base.serialize(obj[i], options, compact, res[key] = Base.serialize(obj[key], options, compact, dictionary);
dictionary); }
} else if (typeof obj === 'number') { } else if (typeof obj === 'number') {
res = options.formatter.number(obj, options.precision); res = options.formatter.number(obj, options.precision);
} else { } else {