dojox.lang.oo: rephrasing tests for default object methods, !strict, …

…refs #10380. git-svn-id: http://svn.dojotoolkit.org/src/dojox/trunk@20882 560b804f-0ae3-0310-86f3-f6aa0a117693
dojo · Nov 23, 2009 · 934c200 · 934c200
1 parent faf5254
commit 934c200
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lang/oo/mixin.js b/lang/oo/mixin.js
@@ -69,7 +69,7 @@ dojo.require("dojox.lang.oo.Decorator");
 			prop = source[name];
 			if(!(name in empty) || empty[name] !== prop){
 				targetName = filter(name, target, source, prop);
-				if(!(targetName in target) || (target[targetName] !== prop && (!(targetName in empty) || empty[targetName] !== prop))){
+				if(targetName && (!(targetName in target) || !(targetName in empty) || empty[targetName] !== prop)){
 					// name is accepted
 					oldValue = target[targetName];
 					newValue = applyDecorator(decorator, targetName, prop, oldValue);
@@ -86,7 +86,7 @@ dojo.require("dojox.lang.oo.Decorator");
 				prop = source[name];
 				if(!(name in empty) || empty[name] !== prop){
 					targetName = filter(name, target, source, prop);
-					if(!(targetName in target) || (target[targetName] !== prop && (!(targetName in empty) || empty[targetName] !== prop))){
+					if(targetName && (!(targetName in target) || !(targetName in empty) || empty[targetName] !== prop)){
 						// name is accepted
 						oldValue = target[targetName];
 						newValue = applyDecorator(decorator, targetName, prop, oldValue);