scratchfoundation/paper.js
1
0
Fork 0
mirror of https://github.com/scratchfoundation/paper.js.git synced 2025-01-20 22:39:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some minor clean-ups for #593.

Browse source
This commit is contained in:
Jürg Lehni 2015-08-21 15:53:37 +02:00
parent 8f9e0f58fa
commit bae7fa435f
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/core/Base.js
View file

@ -77,18 +77,19 @@ 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 (dontCheck || Base.isPlainObject(props)) { if (props && (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 keys = Object.keys(props._filtering || props); var keys = Object.keys(props._filtering || props);
for (var i = 0; i < keys.length; i++) { for (var i = 0, l = keys.length; i < l; i++) {
var key = keys[i]; var key = keys[i];
if (!(exclude && exclude[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 (props[key] !== undefined) var value = props[key];
this[key] = props[key]; if (value !== undefined)
this[key] = value;
} }
} }
return true; return true;
@ -380,9 +381,11 @@ Base.inject(/** @lends Base# */{
res._compact = true; res._compact = true;
} else if (Base.isPlainObject(obj)) { } else if (Base.isPlainObject(obj)) {
res = {}; res = {};
for (var keys = Object.keys(obj), i = 0; i < keys.length; i++) { var keys = Object.keys(obj);
for (var i = 0, l = keys.length; i < l; i++) {
var key = keys[i]; var key = keys[i];
res[key] = Base.serialize(obj[key], options, compact, dictionary); res[key] = Base.serialize(obj[key], options, compact,
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);