cleaned up default value pull request

This commit is contained in:
Eric Rowell
2013-11-27 08:47:52 -08:00
parent b99e71f0b1
commit bc8085bf04

View File

@@ -792,7 +792,7 @@
var type = Kinetic.Util, var type = Kinetic.Util,
obj = {}, obj = {},
attrs = this.getAttrs(), attrs = this.getAttrs(),
key, val; key, val, getter, defaultValue;
obj.attrs = {}; obj.attrs = {};
@@ -800,8 +800,8 @@
for(key in attrs) { for(key in attrs) {
val = attrs[key]; val = attrs[key];
if (!type._isFunction(val) && !type._isElement(val) && !(type._isObject(val) && type._hasMethods(val))) { if (!type._isFunction(val) && !type._isElement(val) && !(type._isObject(val) && type._hasMethods(val))) {
var getter = this[GET + Kinetic.Util._capitalize(key)]; getter = this[GET + Kinetic.Util._capitalize(key)];
var defaultValue = null == getter ? null : getter.call({attrs: {}}); defaultValue = getter ? getter.call({attrs: {}}) : null;
if (defaultValue != val) { if (defaultValue != val) {
obj.attrs[key] = val; obj.attrs[key] = val;
} }