X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=0.6.x%2Fjs%2F01_core%2F14_XTimer.js;h=48b27a3124d63ac2be4def15e1bb6ff2b6471be3;hb=d836e6243878426d4cfd7a14ceb9b77db9f92b57;hp=07250371aa546d842beee008b8925f11864284f9;hpb=5f61a48d303bf9ca6bf021d8957aac743fc8958b;p=pettanr%2FclientJs.git

diff --git a/0.6.x/js/01_core/14_XTimer.js b/0.6.x/js/01_core/14_XTimer.js
index 0725037..48b27a3 100644
--- a/0.6.x/js/01_core/14_XTimer.js
+++ b/0.6.x/js/01_core/14_XTimer.js
@@ -1,4 +1,4 @@
-/**
+/*
  * use X.Callback
  */
 
@@ -34,9 +34,21 @@
 // ------------ local variables -------------------------------------------- //
 // ------------------------------------------------------------------------- //
 
-var X_Timer_SET_TIMEOUT   = window.setTimeout,
+var
+
+	/**
+	 * 現在時の ms を返します。 new Date().getTime() の値です。
+	 * @alias X.Timer.now
+	 * @function
+	 * @return {number} ミリ秒
+	 */
+	X_Timer_now = Date.now || ( function(){ return +new Date; } ),
+
+	X_Timer_SET_TIMEOUT   = window.setTimeout,
 	X_Timer_CLEAR_TIMEOUT = window.clearTimeout,
-	
+
+	// http://uupaa.hatenablog.com/entry/2012/02/01/083607
+	// Firefox 4 partial (request only), Mobile Firefox5 ready (request only), Firefox 11 ready (cancel impl)	
 	X_Timer_REQ_ANIME_FRAME =
 		window.requestAnimationFrame ||
 		window.webkitRequestAnimationFrame ||
@@ -44,6 +56,7 @@ var X_Timer_SET_TIMEOUT   = window.setTimeout,
 		window.oRequestAnimationFrame ||
 		window.msRequestAnimationFrame ||
 		false,
+
 	X_Timer_CANCEL_ANIME_FRAME =
 		window.cancelRequestAnimationFrame ||
 		window.webkitCancelAnimationFrame ||
@@ -56,96 +69,64 @@ var X_Timer_SET_TIMEOUT   = window.setTimeout,
 	X_Timer_INTERVAL_TIME  = 16,
 	X_Timer_TICKET_LIST    = [],
 	X_Timer_removal        = null,
+	X_Timer_skipUpdate     = false,
 	X_Timer_uid            = 0,
 	X_Timer_timerId        = 0,
-	X_Timer_next           = 0,
-	X_Timer_busyTimeout    = false,	
-	X_Timer_endTime        = 0, // iOS
+	X_Timer_busyTimeout    = false,
+	X_Timer_timeStamp      = 0, // setTimeout に登録した時間
+	X_Timer_waitTime       = 0,	// 待ち時間
+	X_Timer_currentUID     = 0, // 現在発火中の uid
 	
 	X_Timer_REQ_FRAME_LIST = [],
 	X_Timer_requestID      = 0,
-	X_Timer_busyOnFrame    = false;
+	X_Timer_busyOnFrame    = false,
 
-// ------------------------------------------------------------------------- //
-// --- interface ----------------------------------------------------------- //
-// ------------------------------------------------------------------------- //
-X.Timer = {
-	
-	add : function( time, opt_count, args1, args2, args3 ){
-		var list = X_Timer_TICKET_LIST,
-			hash, obj;
-		time = time < X_Timer_INTERVAL_TIME ? 1 : time / X_Timer_INTERVAL_TIME | 0; // 正の数で使える「Math.floor(x)」を「(x | 0)」に;
-		
-		if( !X.Type.isNumber( opt_count ) ){
-			args3 = args2;
-			args2 = args1;
-			args1 = opt_count;
-			opt_count = 0;
-		};
-		
-		hash = X_Callback_classifyCallbackArgs( args1, args2, args3 );
-		if( !hash ) return -1; // dev only
-		
-		if( !hash.k ) hash = { f : hash };
-		hash.time  = time;
-		hash.last  = time;
-		hash.count = opt_count;
-		hash.uid   = ++X_Timer_uid;
-		list[ list.length ] = hash;
-		
-	    !X_Timer_busyTimeout && X_Timer_update();
-	    return X_Timer_uid;
-	},
-	
-	once : function( time, args1, args2, args3 ){
-		return X.Timer.add( time, 1, args1, args2, args3 );
-	},
-	
-	remove : function( uid ){
-		var list = X_Timer_TICKET_LIST,
-			i    = list.length,
-			l    = i,
-			f, q;
-		// fire 中の cancel
-		if( X_Timer_busyTimeout ){
-			if( !X_Timer_removal ) X_Timer_removal = {};
-			X_Timer_removal[ uid ] = true;
-		} else {
-			for( ; i; ){
-	
-				if( ( q = list[ --i ] ).uid === uid ){
-					list.splice( i, 1 );
-					( /* q[ INDEX_COUNT ] <= next  || */ l === 1 ) && X_Timer_update();
-					break;
-				};
-			};				
-		};
-	},
-	
-	requestFrame : X_Timer_REQ_ANIME_FRAME ?
+	/**
+	 * requestAnimationFrame をセットします。
+	 * @alias X.Timer.requestFrame
+	 * @function
+	 * @param {*} args1 コールバックのための最大で 3 つの引数を指定します。参考:__CallbackHash__
+	 * @param {*} args2
+	 * @param {*} args3
+	 * @return {number} タイマーID。1 以上の数値。タイマーの解除に使用。
+	 */
+	X_Timer_requestFrame = X_Timer_REQ_ANIME_FRAME ?
 		(function( args1, args2, args3 ){
 			var i = X_Timer_REQ_FRAME_LIST.length,
 				f;
 			i === 0 && ( X_Timer_requestID = X_Timer_REQ_ANIME_FRAME( X_Timer_onEnterFrame ) );
-			f = X_Timer_REQ_FRAME_LIST[ i ] = X_Callback_classifyCallbackArgs( args1, args2, args3 );
+			f = X_Callback_classifyCallbackArgs( args1, args2, args3 );
+			if( !f.kind ) f = { func : f };
+			X_Timer_REQ_FRAME_LIST[ i ] = f;
 			return f.uid = ++X_Timer_uid;
 		}) :
 		(function( args1, args2, args3 ){
 			var i = X_Timer_REQ_FRAME_LIST.length,
 				f;
-			i === 0 && ( X_Timer_requestID = X.Timer.add( 0, 1, X_Timer_onEnterFrame ) );
-			f = X_Timer_REQ_FRAME_LIST[ i ] = X_Callback_classifyCallbackArgs( args1, args2, args3 );
+			i === 0 && ( X_Timer_requestID = X_Timer_add( 0, 1, X_Timer_onEnterFrame ) );
+			f = X_Callback_classifyCallbackArgs( args1, args2, args3 );
+			if( !f.kind ) f = { func : f };
+			X_Timer_REQ_FRAME_LIST[ i ] = f;
 			return f.uid = ++X_Timer_uid;
 		}),
-	
-	cancelFrame : X_Timer_CANCEL_ANIME_FRAME ?
+
+	/**
+	 * requestAnimationFrame を解除します。登録時に受け取ったタイマーIDを使用します。
+	 * @alias X.Timer.cancelFrame
+	 * @function
+	 * @param {number|string} タイマーID, 数字文字の場合もある！
+	 * @return {number} 0 が返る
+	 * @example if( timerID ) timerID = X.Timer.cancelFrame( timerID );
+	 */
+	X_Timer_cancelFrame = X_Timer_CANCEL_ANIME_FRAME ?
 		(function( uid ){
 			var list = X_Timer_REQ_FRAME_LIST,
 				l    = list.length,
 				i    = l,
 				f;
-			// fire 中の cancel
+
 			if( X_Timer_busyOnFrame ){
+				// fire 中の cancel
 				if( !X_Timer_removal ) X_Timer_removal = {};
 				X_Timer_removal[ uid ] = true;
 			} else {
@@ -153,19 +134,22 @@ X.Timer = {
 					if( ( f = list[ --i ] ).uid < uid ) break;
 					if( f.uid === uid ){
 						list.splice( i, 1 );
-						l === 1 && X_Timer_CANCEL_ANIME_FRAME( X_Timer_requestID );
+						// gecko では cancelRequestAnimationFrame が無い場合がある
+						l === 1 && X_Timer_CANCEL_ANIME_FRAME && X_Timer_CANCEL_ANIME_FRAME( X_Timer_requestID );
 						break;
 					};
 				};				
 			};
+			return 0;
 		}) :
 		(function( uid ){
 			var list = X_Timer_REQ_FRAME_LIST,
 				l    = list.length,
 				i    = l,
 				f;
-			// fire 中の cancel
+
 			if( X_Timer_busyOnFrame ){
+				// fire 中の cancel
 				if( !X_Timer_removal ) X_Timer_removal = {};
 				X_Timer_removal[ uid ] = true;
 			} else {
@@ -173,12 +157,43 @@ X.Timer = {
 					if( ( f = list[ --i ] ).uid < uid ) break;
 					if( f.uid === uid ){
 						list.splice( i, 1 );
-						l === 1 && X.Timer.remove( X_Timer_requestID );
+						l === 1 && X_Timer_remove( X_Timer_requestID );
 						break;
 					};
 				};
 			};
-		})
+			return 0;
+		});
+
+
+// ------------------------------------------------------------------------- //
+// --- interface ----------------------------------------------------------- //
+// ------------------------------------------------------------------------- //
+
+/**
+ * <p>setTimeout をラップします。複数のタイマーを登録しても Web ブラウザにはひとつのタイマーを登録します。
+ * <p>参考:<a href="http://d.hatena.ne.jp/amachang/20060924/1159084608" target="_blank">複雑で重くなった JavaScript を超高速化する方法３</a>,
+ * <a href="http://d.hatena.ne.jp/sawat/20070329" target="_blank">[JavaScript]setIntervalを実験する</a>
+ * <p>指定時間の経過したタイマーは、より過去のものから順番にコールバックされます。
+ * <p>setTimeout のコールバックに文字列しか指定できないブラウザがあり対策しています。
+ * <p>requestAnimationFrame をラップします。ベンダープレフィックス付の requestAnimationFrame もない場合、setTimeout にフォールバックします。
+ * 
+ * @namespace X.Timer
+ * @alias X.Timer
+ */ 
+X[ 'Timer' ] = {
+
+	'now'          : X_Timer_now,
+	
+	'add'          : X_Timer_add,
+	
+	'once'         : X_Timer_once,
+	
+	'remove'       : X_Timer_remove,
+	
+	'requestFrame' : X_Timer_requestFrame,
+	
+	'cancelFrame'  : X_Timer_cancelFrame
 	
 };
 
@@ -186,47 +201,139 @@ X.Timer = {
 // --- implements ---------------------------------------------------------- //
 // ------------------------------------------------------------------------- //
 
-if( X.UA.IE4 || X.UA.MacIE ){
+	/**
+	 * タイマーをセットします。
+	 * @alias X.Timer.add
+	 * @param {number} time ミリ秒
+	 * @param {number} opt_count 回数。省略可能。指定回数で自動でタイマーを破棄します。0 を指定した場合無限にタイマーが呼ばれます。省略した場合 0 と同じです。
+	 * @param {*} args1 コールバックのための最大で 3 つの引数を指定します。参考:__CallbackHash__
+	 * @param {*} args2
+	 * @param {*} args3
+	 * @return {number} タイマーID。1 以上の数値。タイマーの解除に使用。
+	 * @example timerID = X.Timer.add( 1000, 5, thisContext, onTimer );
+	 */
+	function X_Timer_add( time, opt_count, args1, args2, args3 ){
+		var list = X_Timer_TICKET_LIST,
+			hash, obj;
+		time = time < X_Timer_INTERVAL_TIME ? 1 : time / X_Timer_INTERVAL_TIME | 0; // 正の数で使える「Math.floor(x)」を「(x | 0)」に;
+		
+		if( !X_Type_isNumber( opt_count ) ){
+			args3 = args2;
+			args2 = args1;
+			args1 = opt_count;
+			opt_count = 0;
+		};
+		
+		hash = X_Callback_classifyCallbackArgs( args1, args2, args3 );
+		if( !hash ) return -1; // dev only
+		
+		if( !hash.kind ) hash = { func : hash };
+		hash.time  = time;
+		hash.last  = time;
+		hash.count = opt_count;
+		hash.uid   = ++X_Timer_uid;
+		list[ list.length ] = hash;
+		
+	    !X_Timer_busyTimeout && X_Timer_update();
+	    return X_Timer_uid;
+	};
+	
+	/**
+	 * 1 回呼ばれたら解除されるタイマーをセットします。
+	 * @alias X.Timer.once
+	 * @param {number} time ミリ秒
+	 * @param {*} args1 コールバックのための最大で 3 つの引数を指定します。参考:__CallbackHash__
+	 * @param {*} args2
+	 * @param {*} args3
+	 * @return {number} タイマーID。1 以上の数値。タイマーの解除に使用。
+	 */
+	function X_Timer_once( time, args1, args2, args3 ){
+		return X_Timer_add( time, 1, args1, args2, args3 );
+	};
+	
+	/**
+	 * タイマーを解除します。登録時に受け取ったタイマーIDを使用します。
+	 * @alias X.Timer.remove
+	 * @param {number} タイマーID
+	 * @return {number} 0 が返る
+	 * @example if( timerID ) timerID = X.Timer.remove( timerID );
+	 */
+	function X_Timer_remove( uid ){
+		var list = X_Timer_TICKET_LIST,
+			i    = list.length,
+			l    = i,
+			f, q, eventDispatcher, lazy, listeners;
+		
+		if( X_Timer_busyTimeout ){
+			// fire 中の cancel
+			if( !X_Timer_removal ) X_Timer_removal = {};
+			X_Timer_removal[ uid ] = true;
+		} else {
+			for( ; i; ){
+				if( ( q = list[ --i ] ).uid === uid ){
+					list.splice( i, 1 );
+					
+					/*
+					 * lazyDispatch 中の EventDispatcher の有無を調べる
+					 */
+					if( X_EventDispatcher_LAZY_TIMERS[ uid ] ){
+						delete X_EventDispatcher_LAZY_TIMERS[ uid ];
+					};
+					
+					!X_Timer_skipUpdate && ( q.last <= X_Timer_waitTime || l === 1 ) && X_Timer_update();
+					break;
+				};
+			};				
+		};
+		return 0;
+	};
+
+if( X_UA[ 'IE4' ] || X_UA[ 'MacIE' ] ){
 	X.Timer[ '_' ] = X_Timer_onTimeout;
 	X_Timer_onTimeout = 'X.Timer._()';
 };
 
 function X_Timer_onTimeout(){
-	var next  = X_Timer_next,
+	var now   = X_Timer_now(),
+		minus = ( ( now - X_Timer_timeStamp ) / X_Timer_INTERVAL_TIME | 0 ) || 1,
 		list  = X_Timer_TICKET_LIST,
 		i     = 0,
 		l     = list.length,
-		limit = X.getTime() + X_Timer_INTERVAL_TIME / 2,
+		limit = now + X_Timer_INTERVAL_TIME / 2,
 		heavy,
 		q, f, c, r, uid;
 	
+	//console.log( '予定時間と発火時間の差:' + ( now - X_Timer_timeStamp - X_Timer_waitTime * X_Timer_INTERVAL_TIME ) + ' -:' + minus + ' next:' + X_Timer_waitTime );
+	
 	if( X_Timer_busyTimeout ){
-		alert( 'busy!' );
+		alert( 'X_Timer_busyTimeout フラグが立ったまま!エラーの可能性' );
 	};
 	
 	X_Timer_busyTimeout = true;
 	
     for( ; i < l; ++i ){
     	q = list[ i ];
-    	if( X_Timer_removal && X_Timer_removal[ q.uid ] ) continue;
-		if( 0 < ( q.last -= next ) ) continue;
-		if( heavy ){
-			if( q.last <= 0 ) q.last = 1;
+    	if(
+    		( X_Timer_removal && X_Timer_removal[ q.uid ] ) || // timerId は remove 登録されている
+			0 < ( q.last -= minus ) || // 時間が経過していない
+			heavy && ( q.last = 1 ) // 時間は経過したが、ヘビーフラグが立っている
+		){
 			continue;
 		};
 		c = q.count;
 		
-		if( q.k ){
-			//q.a = [];
+		X_Timer_currentUID = q.uid;
+		
+		if( q.kind ){
 			r = X_Callback_proxyCallback( q, [] );
 		} else {
-			r = q.f();
+			r = q.func();
 		};
 		
 		//console.log( 'fire....' );
 		
-		if( limit <= X.getTime() ){
-			console.log( '******* heavy!' );
+		if( limit <= X_Timer_now() ){
+			//console.log( '******* heavy!' );
 			// 関数の実行に時間がかかる場合、次のタイミングに
 			heavy = true;
 		};
@@ -240,12 +347,16 @@ function X_Timer_onTimeout(){
 		if( 1 < c ) --q.count;
 		q.last = q.time;
     };
-    X_Timer_timerId     = 0;
+    X_Timer_timerId     = X_Timer_currentUID = 0;
     X_Timer_busyTimeout = false;
+    
     if( X_Timer_removal ){
+    	X_Timer_skipUpdate = true;
     	for( uid in X_Timer_removal ){
-    		X.Timer.remove( X_Timer_removal[ uid ] );
+    		//if( X_EMPTY_OBJECT[ uid ] ) continue;
+    		X_Timer_remove( uid );
     	};
+    	X_Timer_skipUpdate = false;
     	X_Timer_removal = null;
     };
     X_Timer_update();
@@ -265,23 +376,36 @@ function X_Timer_update(){
 	
     n = list[ i - 1 ].last;
     
-    if( n < X_Timer_next || X_Timer_timerId === 0 ){
-    	X_Timer_timerId && X_Timer_CLEAR_TIMEOUT( X_Timer_timerId );
-    	X_Timer_timerId = X_Timer_SET_TIMEOUT( X_Timer_onTimeout, X_Timer_INTERVAL_TIME * n );
-    	X_Timer_endTime = X.getTime() + X_Timer_INTERVAL_TIME * n; // iOS
-    	X_Timer_next = n;
+    if( n < X_Timer_waitTime || X_Timer_timerId === 0 ){
+    	if( X_Timer_timerId ){
+    		X_Timer_CLEAR_TIMEOUT( X_Timer_timerId );
+    		n -= ( X_Timer_now() - X_Timer_timeStamp ) / X_Timer_INTERVAL_TIME | 0;
+    		0 <= n || ( n = 0 ); // 負の数は 0 に
+    	};
+    	X_Timer_timeStamp = X_Timer_now();
+    	X_Timer_timerId   = X_Timer_SET_TIMEOUT( X_Timer_onTimeout, X_Timer_INTERVAL_TIME * n );
+    	X_Timer_waitTime  = n;
     };
 };
 
+// 大きい -> 小さい
+function X_Timer_compareQueue( a, b ){
+	return a.last < b.last ? 1 : a.last === b.last ? 0 : -1;
+};
+
 // http://havelog.ayumusato.com/develop/javascript/e528-ios6_scrolling_timer_notcall.html
 // iOS6 スクロール中のタイマー発火絡みのバグ備忘
-if( X.UA.iOS ){
+if( X_UA[ 'iOS' ] ){
 	window.addEventListener( 'scroll', function(){
-		var last;
+		var last, now;
 		if( X_Timer_timerId ){
-			window.clearTimeout( X_Timer_timerId );
-			last = X_Timer_endTime - X.getTime();
-			X_Timer_timerId = X_Timer_SET_TIMEOUT( X_Timer_onTimeout, 0 < last ? last : 0 );
+			X_Timer_CLEAR_TIMEOUT( X_Timer_timerId );
+			now               = X_Timer_now();
+			last              = X_Timer_timeStamp + X_Timer_INTERVAL_TIME * X_Timer_waitTime - now;
+			X_Timer_timerId   = X_Timer_SET_TIMEOUT( X_Timer_onTimeout, 0 < last ? last : 0 );
+			// 更新
+			X_Timer_timeStamp = now;
+			X_Timer_waitTime  = last / X_Timer_INTERVAL_TIME | 0;
 		};
 	});
 };
@@ -293,39 +417,34 @@ function X_Timer_onEnterFrame( time ){
 		l    = list.length,
 		i    = 0, q, uid, args;
 
-	time = time || X.getTime();
+	time = time || X_Timer_now();
 	X_Timer_busyOnFrame = true;
-	// console.log( X.getTime() + ' , ' + time );
+	// console.log( X_Timer_now() + ' , ' + time );
     for( ; i < l; ++i ){
     	q = list[ i ];
     	
     	if( X_Timer_removal && X_Timer_removal[ q.uid ] ) continue;
     	
-		if( q.k ){
+		if( q.kind ){
 			X_Callback_proxyCallback( q, args || ( args = [ time ] ) );
 		} else {
-			q( time );
+			q.func( time );
 		};
     };
 
     list.splice( 0, l );
     if( list.length ){
-    	X_Timer_requestID = X_Timer_REQ_ANIME_FRAME ? X_Timer_REQ_ANIME_FRAME( X_Timer_onEnterFrame ) : X.Timer.add( 0, 1, X_Timer_onEnterFrame );
+    	X_Timer_requestID = X_Timer_REQ_ANIME_FRAME ? X_Timer_REQ_ANIME_FRAME( X_Timer_onEnterFrame ) : X_Timer_add( 0, 1, X_Timer_onEnterFrame );
     };
     
     X_Timer_busyOnFrame = false;
     if( X_Timer_removal ){
     	for( uid in X_Timer_removal ){
-    		X.Timer.cancelFrame( X_Timer_removal[ uid ] );
+    		//if( X_EMPTY_OBJECT[ uid ] ) continue;
+    		X_Timer_cancelFrame( X_Timer_removal[ uid ] );
     	};
     	X_Timer_removal = null;
     };
 };
 
-// 大きい -> 小さい
-function X_Timer_compareQueue( a, b ){
-	return a.last < b.last ? 1 : a.last === b.last ? 0 : -1;
-};
-
-
 console.log( 'X.Core.Timer' );