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=2c877f22d61cf9cb067c28123b5d08faeb773d40;hp=8ae688ed927253fc93e7bfcbbb5f9e9e2e7f15bb;hb=04ac203dfb25cc7e92db1f7f9f77122841f7cb1a;hpb=bafa8683f87b2f909d1301fca80684bf9ff221ed diff --git a/0.6.x/js/02_dom/10_XNodeAnime.js b/0.6.x/js/02_dom/10_XNodeAnime.js index 8ae688e..2c877f2 100644 --- a/0.6.x/js/02_dom/10_XNodeAnime.js +++ b/0.6.x/js/02_dom/10_XNodeAnime.js @@ -12,7 +12,8 @@ var X_NodeAnime_QUEUE = [], /* Opera mobile で translateZ(0) が有効だと XY が 0 0 になる */ /* GPUレイヤーにいる間に要素のコンテンツを変更をすると transitionend が動かなくなるっぽい Mac safari と firefox */ X_NodeAnime_translateZ = X_Node_CSS_VENDER_PREFIX[ 'perspective' ] && - !X_UA[ 'OperaMobile' ] && !X_UA[ 'OperaTablet' ] ? ' translateZ(0)' : '', + !X_UA[ 'OperaMobile' ] && !X_UA[ 'OperaTablet' ] && + !( X_UA[ 'IE' ] === 11 ) && !( X_UA[ 'IEHost' ] === 11 ) ? ' translateZ(0)' : '', /* * phase: @@ -521,7 +522,7 @@ function X_NodeAnime_updatePosition( xnode, obj, ratio, useGPU ){ //console.log( 'updatePosition x:' + x + ' gpu:' + !!useGPU ); if( obj.transform ){ - if( x === x || y === y ) str += ' translate(' + ( x | 0 ) + 'px,' + ( y | 0 ) + 'px)'; + if( ( x === x || y === y ) && ( x !== 0 && y !== 0 ) ) str += ' translate(' + ( x | 0 ) + 'px,' + ( y | 0 ) + 'px)'; if( rotate < 0 || 0 < rotate ) str += ' rotate(' + rotate + 'deg)'; // opera は rad? if( skewX < 0 || 0 < skewX ) str += ' skewX(' + skewX + 'deg)'; if( skewY < 0 || 0 < skewY ) str += ' skewY(' + skewY + 'deg)';