merged with latest trunk

This commit is contained in:
ericdrowell 2012-09-24 20:36:54 -07:00
commit 90ba0d9a78
3 changed files with 5 additions and 5 deletions

View File

@ -2824,7 +2824,7 @@ Kinetic.Stage.prototype = {
// serialize only attributes that are not function, image, DOM, or objects with methods
for(var key in node.attrs) {
var val = node.attrs[key];
if(!type._isFunction(val) && !type._isElement(val) && !type._hasMethods(val)) {
if(!type._isFunction(val) && !type._isElement(val) && !(type._isObject(val) && type._hasMethods(val))) {
obj.attrs[key] = val;
}
}

File diff suppressed because one or more lines are too long

View File

@ -149,7 +149,7 @@ Kinetic.Stage.prototype = {
// serialize only attributes that are not function, image, DOM, or objects with methods
for(var key in node.attrs) {
var val = node.attrs[key];
if(!type._isFunction(val) && !type._isElement(val) && !type._hasMethods(val)) {
if(!type._isFunction(val) && !type._isElement(val) && !(type._isObject(val) && type._hasMethods(val))) {
obj.attrs[key] = val;
}
}