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=8ae688ed927253fc93e7bfcbbb5f9e9e2e7f15bb;hp=765dec713c859617a2ee15857705acad3c92975a;hb=bafa8683f87b2f909d1301fca80684bf9ff221ed;hpb=d3d95fb0bc2ab2f61c7f15746b2d64078ef39af8

diff --git a/0.6.x/js/02_dom/10_XNodeAnime.js b/0.6.x/js/02_dom/10_XNodeAnime.js
index 765dec7..8ae688e 100644
--- a/0.6.x/js/02_dom/10_XNodeAnime.js
+++ b/0.6.x/js/02_dom/10_XNodeAnime.js
@@ -12,9 +12,7 @@ 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' ] //&&
-									/* ハードウェアによると思うが IE11 と Win8.1 で画面(塗)が乱れる */
-									/* !( ( X_UA[ 'IE' ] === 11 || X_UA[ 'IEHost' ] === 11 ) && X_UA[ 'Windows' ] === 8.1 ) */ ? ' translateZ(0)' : '',
+									!X_UA[ 'OperaMobile' ] && !X_UA[ 'OperaTablet' ] ? ' translateZ(0)' : '',
 
 /*
  * phase:
@@ -354,7 +352,7 @@ function X_NodeAnime_updateAnimations( e ){
 		now  = X_Timer_now(),
 		c    = false,
 		i, xnode, obj, _xnode,
-		rm, easing, lazy;
+		rm, progress, easing, lazy;
 	
 	if( X_NodeAnime_needsDetection ){
 		X_NodeAnime_needsDetection = false;
@@ -384,8 +382,8 @@ function X_NodeAnime_updateAnimations( e ){
 		switch( obj.phase ){
 			case 7 : // アニメーション中
 				if( now < obj.toTime ){
-					obj.progress = ( now - obj.fromTime ) / obj.duration;
-					easing      = obj.easing( obj.progress );
+					obj.progress = progress = ( now - obj.fromTime ) / obj.duration;
+					easing      = obj.easing( progress );
 					obj.x       = ( obj.toX       - obj.fromX       ) * easing + obj.fromX;
 					obj.y       = ( obj.toY       - obj.fromY       ) * easing + obj.fromY;
 					obj.rotate  = ( obj.toRotate  - obj.fromRotate  ) * easing + obj.fromRotate;
@@ -396,7 +394,7 @@ function X_NodeAnime_updateAnimations( e ){
 					obj.alpha   = ( obj.toAlpha   - obj.fromAlpha   ) * easing + obj.fromAlpha;
 					obj.scrollX = ( obj.toScrollX - obj.fromScrollX ) * easing + obj.fromScrollX;
 					obj.scrollY = ( obj.toScrollY - obj.fromScrollY ) * easing + obj.fromScrollY;
-					X_NodeAnime_updatePosition( xnode, obj, obj.progress, true );
+					X_NodeAnime_updatePosition( xnode, obj, progress, true );
 					c = true;
 					break;
 				};