X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=0.6.x%2Fjs%2F20_ui%2F06_AbstractUINode.js;h=5e0dce71351788189be4b08c6edbe9b2e2a3b95f;hb=3d352d8bf476ab57cc333e8d02d0e6ea5efa69b7;hp=87cea6324959edcb326bbd063407d72a7e6c1da4;hpb=094b0536bafe5efd70540698cf74ab13ece03ebb;p=pettanr%2FclientJs.git

diff --git a/0.6.x/js/20_ui/06_AbstractUINode.js b/0.6.x/js/20_ui/06_AbstractUINode.js
index 87cea63..5e0dce7 100644
--- a/0.6.x/js/20_ui/06_AbstractUINode.js
+++ b/0.6.x/js/20_ui/06_AbstractUINode.js
@@ -740,11 +740,11 @@ var XUI_AbstractUINode = X_EventDispatcher[ 'inherits' ](
 				};
 			};
 			
-			arg1 && arg1.kind ? ( f = arg1 ) : ( f = X_Callback_classifyCallbackArgs( arg1, arg2, arg3 ) );
+			arg1 && arg1.kind ? ( f = arg1 ) : ( f = X_Closure_classifyCallbackArgs( arg1, arg2, arg3 ) );
 			if( !f.kind ){
 				return X_EventDispatcher_listen.call( this, type, this.User, f );
 			} else
-			if( f.kind === X_Callback_FUNC_ONLY ){
+			if( f.kind === X_CLOSURE_FUNC_ONLY ){
 				return X_EventDispatcher_listen.call( this, type, this.User, f.func, f.supplement );
 			};
 			return X_EventDispatcher_listen.apply( this, arguments );
@@ -777,11 +777,11 @@ var XUI_AbstractUINode = X_EventDispatcher[ 'inherits' ](
 					};
 				};
 			};
-			arg1 && arg1.kind ? ( f = arg1 ) : ( f = X_Callback_classifyCallbackArgs( arg1, arg2, arg3 ) );
+			arg1 && arg1.kind ? ( f = arg1 ) : ( f = X_Closure_classifyCallbackArgs( arg1, arg2, arg3 ) );
 			if( !f.kind ){
 				return X_EventDispatcher_unlisten.apply( this, [ type, this.User, f ] );
 			} else
-			if( f.kind === X_Callback_FUNC_ONLY ){
+			if( f.kind === X_CLOSURE_FUNC_ONLY ){
 				return X_EventDispatcher_unlisten.apply( this, [ type, this.User, f.func, f.supplement ] );
 			};
 			return X_EventDispatcher_unlisten.apply( this, arguments );
@@ -794,12 +794,12 @@ var XUI_AbstractUINode = X_EventDispatcher[ 'inherits' ](
 				type = e.type || e;
 			
 			// TODO captureEvent PointerEvent
-			if( ret & X_Callback_CAPTURE_POINTER && !this.hitChildData && XUI_Event._POINTER_MOVE === type ){
+			if( ret & X_CALLBACK_CAPTURE_POINTER && !this.hitChildData && XUI_Event._POINTER_MOVE === type ){
 				this.rootData.monopolyNodeData = this;
 				return ret;
 			};
 			this.rootData.monopolyNodeData = null;
-			if( xve._START_BUBLEUP < type && this.parentData && !( ret & X_Callback_STOP_PROPAGATION ) && !( ret & X_Callback_STOP_NOW ) ) return this.parentData[ 'dispatch' ]( e );
+			if( xve._START_BUBLEUP < type && this.parentData && !( ret & X_CALLBACK_STOP_PROPAGATION ) && !( ret & X_CALLBACK_STOP_NOW ) ) return this.parentData[ 'dispatch' ]( e );
 			return ret;
 		},
 		
@@ -1073,14 +1073,14 @@ X.UI.AbstractUINode = X_Class_create(
 					for( i = 0, l = list.length; i < l; ++i ){
 						f = list[ i ];
 						switch( f.kind ){
-							case X_Callback_THIS_FUNC :
+							case X_CLOSURE_THIS_FUNC :
 								if( f.lock ){
 									X_EventDispatcher_systemListen( newNode, type, f.context === this ? newNode : f.context, f.func, f.supplement );
 								} else {
 									newNode[ f.once ? 'listenOnce' : 'listen' ]( type, f.context === this ? newNode : f.context, f.func, f.supplement );
 								};
 								break;
-							case X_Callback_HANDLEEVENT :
+							case X_CLOSURE_HANDLEEVENT :
 								if( f.lock ){
 									X_EventDispatcher_systemListen( newNode, type, f.context === this ? newNode : f.context, f.supplement );
 								} else {
@@ -1088,7 +1088,7 @@ X.UI.AbstractUINode = X_Class_create(
 								};
 								break;
 							/*
-							case X_Callback_FUNC_ONLY :
+							case X_CLOSURE_FUNC_ONLY :
 								if( f.lock ){
 									X_EventDispatcher_systemListen( newNode, type, f.func, f.supplement );
 								} else {