X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=0.6.x%2Fjs%2F01_core%2F13_XEventDispatcher.js;h=25c2d11477034a160a6fcb231065e418636740b8;hb=dad4215398716c9913e80ec902c76db6762c1dce;hp=b3763fcdb39b37788917af2a91f801d5be113d0a;hpb=a09eec2e19c91d656e784e71c73acacb8368f491;p=pettanr%2FclientJs.git

diff --git a/0.6.x/js/01_core/13_XEventDispatcher.js b/0.6.x/js/01_core/13_XEventDispatcher.js
index b3763fc..25c2d11 100644
--- a/0.6.x/js/01_core/13_XEventDispatcher.js
+++ b/0.6.x/js/01_core/13_XEventDispatcher.js
@@ -120,6 +120,14 @@ X.EventDispatcher =
 		 * @type {boolean}
 		 */
 			'_killReserved' : false,
+
+		/**
+		 * asyncDispatch 中に kill が呼ばれた場合に、X.EventDispatcher インスタンスの削除を最後のタイマーの発火後にずらすために立てるフラグ。
+		 * TODO asyncDispatch の解除はどうする?
+		 * @private
+		 * @type {boolean}
+		 */
+			'_lastLazyID' : false,
 			
 	    /**
 	     * X.EventDispatcher のコンストラクタの実体。
@@ -229,7 +237,7 @@ X.EventDispatcher =
 					e = delay;
 					delay = 0;
 				};
-				return X.Timer.add( delay, 1, this, this.dispatch, [ e ] );
+				return this[ '_lastLazyID' ] = X.Timer.add( delay, 1, this, X_EventDispatcher_dispatch, [ e ] );
 			}
 		}
 	);
@@ -297,6 +305,11 @@ function X_EventDispatcher_dispatch( e ){
 	};
 	
 	if( ( --this._dispatching ) === 0 ){
+		
+		if( this[ '_lastLazyID' ] && X_Timer_currentUID === this[ '_lastLazyID' ] ){
+			delete this[ '_lastLazyID' ];
+		};
+		
 		// dispatch 中に unlisten された要素の削除
 		unlistens = this._unlistens;
 		delete this._dispatching;
@@ -304,6 +317,7 @@ function X_EventDispatcher_dispatch( e ){
 		// _unlistens に入っている callbackHash は、lock をクリアしている
 		X_EventDispatcher_unlock = true;
 		for( type in unlistens ){
+			//if( X_EMPTY_OBJECT[ type ] ) continue;
 			list = unlistens[ type ];
 			for( i = list.length; i; ){
 				this.unlisten( type, list[ --i ] );
@@ -419,6 +433,7 @@ function X_EventDispatcher_unlisten( opt_type, opt_arg1, opt_arg2, opt_arg3 ){
 	if( opt_type === undefined ){
 		// 全て削除
 		for( opt_type in list ){
+			//if( X_EMPTY_OBJECT[ opt_type ] ) continue;
 			_list = list[ opt_type ];
 			for( i = _list.length; i; ){
 				this.unlisten( opt_type, _list[ --i ] ); // override されていることがあるので、必ず unlisten を使用
@@ -521,7 +536,6 @@ var X_EventDispatcher_actualAddEvent =
 			} else {
 				console.log( 'event > ' + type );
 				that._handleEvent || ( that._handleEvent = X_Callback_create( that, X_EventDispatcher_actualHandleEvent ) );
-				
 
 				if( raw.addEventListener ){
 					raw.addEventListener( type, that._handleEvent, false );
@@ -754,6 +768,7 @@ function X_EventDispatcher_toggleAllEvents( that, add ){
 		type;
 	if( !list || !raw ) return;
 	for( type in list ){
+		//if( X_EMPTY_OBJECT[ type ] ) continue;
 		// 数字イベントの除外
 		if( '' + parseFloat( type ) !== type ){
 			// TODO type rename はここ