Merge pull request #1173 from cb1kenobi/timob-7173

[TIMOB-7173] Fixed bug with checking setter and getter functions in lang.mixProps()
tidev · Jan 13, 2012 · 1f13651 · 1f13651
2 parents 96fae69 + 7e30962
commit 1f13651
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/mobileweb/src/loader.js b/mobileweb/src/loader.js
@@ -1643,12 +1643,11 @@ require.cache({
 								d.__values__ || (d.__values__ = {});
 								for (i in src[p]) {
 									(function(property, externalDest, internalDest, valueDest, /* setter/getter, getter, or value */ descriptor, capitalizedName, writable) {
-										var getter,
-											setter;
+										var o = is(descriptor, "Object"),
+											getter = o && is(descriptor.get, "Function") && descriptor.get,
+											setter = o && is(descriptor.set, "Function") && descriptor.set;
 
-										if (is(descriptor, "Object") && ((getter = is(descriptor.get, "Function")) || (setter = is(descriptor.set, "Function")))) {
-											getter && (getter = descriptor.get);
-											setter && (setter = descriptor.set);
+										if (o && (getter || setter)) {
 											valueDest[property] = descriptor.value;
 										} else if (is(descriptor, "Function")) {
 											getter = descriptor;