X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=0.6.x%2Fjs%2F02_dom%2F10_XNodeAnime.js;h=2d20bad71dc7ea1432eb462cb86620ccaa3950bb;hb=b28fd52ddc41a1c927f92fa7eeeb6891c41e55d9;hp=8bb80ef61d11439b3ff99104f692ca32486b19a4;hpb=34431df46635079c1ce6626c9caf1456f88e91bd;p=pettanr%2FclientJs.git diff --git a/0.6.x/js/02_dom/10_XNodeAnime.js b/0.6.x/js/02_dom/10_XNodeAnime.js index 8bb80ef..2d20bad 100644 --- a/0.6.x/js/02_dom/10_XNodeAnime.js +++ b/0.6.x/js/02_dom/10_XNodeAnime.js @@ -382,7 +382,7 @@ function X_Node_Anime_updateAnimation( xnode ){ X_Node_Anime_clearTransition( xnode ); X_Node_Anime_updatePosition( xnode, obj.destX, obj.destY, obj.destA, phase === 14 ); obj.phase = phase === 14 ? 10 : 4; - xnode[ 'asyncDispatch' ]( time, { type : X_EVENT_ANIME_END, 'gpu' : obj.gpuParent } ); + xnode[ 'dispatch' ]( time, { type : X_EVENT_ANIME_END, 'gpu' : obj.gpuParent } ); } else { current = X_Node_Anime_getComputedPosition( xnode ); obj.startX = current.x; @@ -501,15 +501,15 @@ function X_Node_Anime_updatePosition( xnode, x, y, opacity, useGPU ){ if( X_Node_Anime_hasTransform ){ xnode[ 'css' ]({ transform : 'translate(' + ( x | 0 ) + 'px,' + ( y | 0 ) + 'px)' + ( useGPU ? X_Node_Anime_translateZ : '' ), - opacity : opacity === 1 ? '' : opacity + opacity : opacity }); } else { x === x && xnode[ 'css' ]({ left : ( x | 0 ) + 'px', - opacity : opacity === 1 ? '' : opacity }); + opacity : opacity }); y === y && xnode[ 'css' ]({ top : ( y | 0 ) + 'px', - opacity : opacity === 1 ? '' : opacity }); + opacity : opacity }); }; if( X_Node_Anime_translateZ ){