Verison 0.6.201, X.UI.ScrollBox woring at IE5.5 well.

[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 cbf6a33..5404814 100644 (file)
--- a/0.6.x/js/02_dom/10_XNodeAnime.js
+++ b/0.6.x/js/02_dom/10_XNodeAnime.js
@@ -51,7 +51,9 @@ function X_Node_animate( start, dest, duration, easing, lazyRelease, option ){
        \r
        if( !obj ){\r
                this[ '_anime' ] = obj = {\r
-                               x : 0, y : 0, a : 1,\r
+                               x : X_NodeAnime_hasTransform ? 0 : NaN,\r
+                               y : X_NodeAnime_hasTransform ? 0 : NaN,\r
+                               a : 1,\r
                                duration : 0\r
                                //phase, lazyRelease, easing, follower, releaseNow\r
                        };\r
@@ -152,7 +154,7 @@ function X_Node_stop( option ){
                case 4 : // 強制停止(GPU転送予約)\r
                case 7 : // アニメーション中\r
                        if( option & X_NODE_ANIME_RESET ){\r
-                               obj.startX = obj.startY = obj.destX = obj.destY = obj.x = obj.y = 0;\r
+                               obj.startX = obj.startY = obj.destX = obj.destY = obj.x = obj.y = X_NodeAnime_hasTransform ? 0 : NaN;\r
                                obj.startA = obj.destA = obj.a = 1;\r
                        }; // TODO 終了値で停止も,,,\r
                        \r
@@ -276,8 +278,8 @@ function X_NodeAnime_updateAnimations( e ){
                                if( now < obj.destTime ){\r
                                        easing = obj.progress  = obj.easing.fn( ( now - obj.startTime ) / obj.duration );\r
                                        X_NodeAnime_updatePosition( xnode, \r
-                                               obj.x = ( obj.destX - obj.startX ) * easing + obj.startX | 0,\r
-                                               obj.y = ( obj.destY - obj.startY ) * easing + obj.startY | 0,\r
+                                               obj.x = ( obj.destX - obj.startX ) * easing + obj.startX,\r
+                                               obj.y = ( obj.destY - obj.startY ) * easing + obj.startY,\r
                                                obj.a = ( obj.destA - obj.startA ) * easing + obj.startA, true );\r
                                        c = true;\r
                                        break;\r