X-Git-Url: http://git.osdn.jp/view?p=pettanr%2FclientJs.git;a=blobdiff_plain;f=0.6.x%2Fjs%2F02_dom%2F10_XNodeAnime.js;fp=0.6.x%2Fjs%2F02_dom%2F10_XNodeAnime.js;h=580d6da81f6b7ed30cbae0b9bc447e84aa90efcc;hp=e856bd85bffec7205f5adf92fc62fa3cd75144b1;hb=009b1cd0cebdd15591a9abfb964fb57b41ccb5f9;hpb=3d10dbbb167c89638f3bea6c267de8763274d30c

diff --git a/0.6.x/js/02_dom/10_XNodeAnime.js b/0.6.x/js/02_dom/10_XNodeAnime.js
index e856bd8..580d6da 100644
--- a/0.6.x/js/02_dom/10_XNodeAnime.js
+++ b/0.6.x/js/02_dom/10_XNodeAnime.js
@@ -146,7 +146,7 @@ function X_Node_animate( obj ){
 	obj.altY        = fallback & 16 ? 'bottom' : 'top';
 	
 	// scale
-	if( obj.toScaleX !== 1 && obj.fromScaleX !== 1 && obj.toScaleY !== 1 && obj.fromScaleY !== 1 ){
+	if( obj.toScaleX !== 1 || obj.fromScaleX !== 1 || obj.toScaleY !== 1 || obj.fromScaleY !== 1 ){
 		sameRate = obj.fromScaleX === obj.fromScaleY && obj.toScaleX === obj.toScaleY;
 		
 		if( X_NodeAnime_hasTransform ){
@@ -315,7 +315,7 @@ function X_NodeAnime_stopNow( xnode ){
  */
 function X_NodeAnime_detectWaitAnimation( xnode, duration, isTest ){
 	var list = X_NodeAnime_QUEUE,
-		i    = 0, _xnode;
+		i    = 0, _xnode, obj;
 	
 	for( ; _xnode = list[ i ]; ++i ){
 		if( _xnode === xnode ) break;