scratchfoundation/paper.js
1
0
Fork 0
mirror of https://github.com/scratchfoundation/paper.js.git synced 2025-01-03 19:45:44 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #593 from megawac/helpers

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

22
src/core/Base.js
View file

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