Version 0.6.188, fix X.UI.

[pettanr/clientJs.git] / 0.6.x / js / 02_dom / 10_XNodeAnime.js

diff --git a/0.6.x/js/02_dom/10_XNodeAnime.js b/0.6.x/js/02_dom/10_XNodeAnime.js
index 2d20bad..7064166 100644 (file)
--- a/0.6.x/js/02_dom/10_XNodeAnime.js
+++ b/0.6.x/js/02_dom/10_XNodeAnime.js
@@ -497,19 +497,16 @@ function X_Node_Anime_clearTransition( xnode ){
 };\r
 \r
 function X_Node_Anime_updatePosition( xnode, x, y, opacity, useGPU ){\r
-       console.log( 'updatePosition x:' + x + ' gpu:' + !!useGPU );\r
+       //console.log( 'updatePosition x:' + x + ' gpu:' + !!useGPU );\r
        if( X_Node_Anime_hasTransform ){\r
                xnode[ 'css' ]({\r
                        transform : 'translate(' + ( x | 0 ) + 'px,' + ( y | 0 ) + 'px)' + ( useGPU ? X_Node_Anime_translateZ : '' ),\r
                        opacity   : opacity\r
                });\r
        } else {\r
-               x === x && xnode[ 'css' ]({\r
-                       left    : ( x | 0 ) + 'px',\r
-                       opacity : opacity });\r
-               y === y && xnode[ 'css' ]({\r
-                       top     : ( y | 0 ) + 'px',\r
-                       opacity : opacity });\r
+               x === x && xnode[ 'css' ]( 'left', ( x | 0 ) + 'px' );\r
+               y === y && xnode[ 'css' ]( 'top', ( y | 0 ) + 'px' );\r
+               opacity === opacity && xnode[ 'css' ]( 'opacity', opacity );\r
        };\r
 \r
        if( X_Node_Anime_translateZ ){\r
@@ -518,15 +515,14 @@ function X_Node_Anime_updatePosition( xnode, x, y, opacity, useGPU ){
                                xnode[ '_flags' ] &= X_Node_BitMask_RESET_GPU;\r
                                xnode[ '_flags' ] |= X_NodeFlags_GPU_NOW;\r
                        } else\r
-                       if( xnode[ '_flags' ] & X_NodeFlags_GPU_NOW ){\r
-                       } else {\r
+                       if( !( xnode[ '_flags' ] & X_NodeFlags_GPU_NOW ) ){\r
                                xnode[ '_flags' ] &= X_Node_BitMask_RESET_GPU;\r
                                xnode[ '_flags' ] |= X_NodeFlags_GPU_RESERVED;\r
                        };\r
                } else {\r
                        if( xnode[ '_flags' ] & X_NodeFlags_GPU_NOW ){\r
                                xnode[ '_flags' ] &= X_Node_BitMask_RESET_GPU;\r
-                               xnode[ '_flags' ] |= X_NodeFlags_GPU_RELEASE_RESERVED;                  \r
+                               xnode[ '_flags' ] |= X_NodeFlags_GPU_RELEASE_RESERVED;\r
                        } else\r
                        if( xnode[ '_flags' ] & X_NodeFlags_GPU_RESERVED ){\r
                                xnode[ '_flags' ] &= X_Node_BitMask_RESET_GPU;\r
@@ -551,7 +547,7 @@ function X_Node_Anime_updateAnimationsNoTransition( e ){
 \r
                        delete xnode[ '_anime' ];\r
                        X_Node_ANIMATIONS.splice( i, 1 );\r
-                       \r
+                       console.log( obj.destA );\r
                        // filter な 親が解除されないと子要素への filter が反映されない\r
                        xnode[ 'asyncDispatch' ]( { type : X_EVENT_ANIME_END, 'gpu' : false } );\r
                } else {\r
@@ -563,11 +559,11 @@ function X_Node_Anime_updateAnimationsNoTransition( e ){
                        obj.x = newX;\r
                        obj.y = newY;\r
                        obj.a = newA;\r
-                       c = true;       \r
+                       c = true;\r
                };\r
        };\r
        \r
-       c && console.log( 'anime... ' + X_Node_updateTimerID );\r
+       //c && console.log( 'anime... ' + X_Node_updateTimerID );\r
        \r
        if( X_Node_Anime_reserved = c ){\r
                if( X_Node_updateTimerID ){\r