X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=0.6.x%2Fjs%2F20_ui%2F04_XUI_Event.js;h=d5117b628ddebe80a3196c66a5e11c1d8429e97a;hb=512e08f4d38eab417f9651277e8a50c08535cb07;hp=1f1c85f615aecb2ca94dd75fb5b374ceb1fa532e;hpb=003fff3f160afb3e3a2cceb3d20b19a17977e94d;p=pettanr%2FclientJs.git

diff --git a/0.6.x/js/20_ui/04_XUI_Event.js b/0.6.x/js/20_ui/04_XUI_Event.js
index 1f1c85f..d5117b6 100644
--- a/0.6.x/js/20_ui/04_XUI_Event.js
+++ b/0.6.x/js/20_ui/04_XUI_Event.js
@@ -1,15 +1,18 @@
 
-X.UI.Event = {
+var XUI_Event = X[ 'UI' ][ 'Event' ] = {
 
 	INIT              : ++X_Event_last,
 	ADDED             : ++X_Event_last,
 	CREATION_COMPLETE : ++X_Event_last,
 	REMOVED           : ++X_Event_last,
 
+	LAYOUT_BEFORE     : ++X_Event_last,
+	LAYOUT_COMPLETE   : ++X_Event_last,
+
 	// http://d.hatena.ne.jp/edvakf/20100205/1265338487
 	// http://d.hatena.ne.jp/uupaa/20100401/1270097629
-	ENTER_VIEW        : ++X_Event_last, // 要素が視界に入った
-	OUT_VIEW          : ++X_Event_last,
+	VIEW_IN           : ++X_Event_last, // 要素が視界に入った
+	VIEW_OUT          : ++X_Event_last,
 	
 	POINTER_OUT       : ++X_Event_last,
 	POINTER_IN        : ++X_Event_last,
@@ -28,19 +31,10 @@ X.UI.Event = {
 	_START_BUBLEUP    : X_Event_last + 0.5,		
 
 	// raw pointing device event
-	
 	_POINTER_DOWN     : ++X_Event_last,
+	_POINTER_MOVE     : ++X_Event_last,	
 	_POINTER_UP       : ++X_Event_last,
-	_POINTER_MOVE     : ++X_Event_last,
 	_POINTER_CANCEL   : ++X_Event_last,
-	_TOUCH_START      : ++X_Event_last,
-	_TOUCH_END        : ++X_Event_last,
-	_TOUCH_MOVE       : ++X_Event_last,
-	_TOUCH_CANCEL     : ++X_Event_last,
-	_MOUSE_DOWN       : ++X_Event_last,
-	_MOUSE_UP         : ++X_Event_last,
-	_MOUSE_MOVE       : ++X_Event_last,
-	_MOUSE_CANCEL     : ++X_Event_last,
 	
 	FILE_DRAG         : ++X_Event_last,
 	FILE_DRAG_START   : ++X_Event_last,
@@ -109,47 +103,35 @@ X.UI.Event = {
 	ANIME_BEFORE_STOP   : ++X_Event_last, // before cancel
 	ANIME_STOP          : ++X_Event_last,
 
-	PAGE_BEFORE_SHOW    : ++X_Event_last,
+	PAGE_SHOW_BEFORE    : ++X_Event_last,
 	PAGE_SHOW           : ++X_Event_last,
-	PAGE_AFTER_SHOW     : ++X_Event_last,
-	PAGE_BEFORE_HIDE    : ++X_Event_last,
+	PAGE_SHOW_AFTER     : ++X_Event_last,
+	PAGE_HIDE_BEFORE    : ++X_Event_last,
 	PAGE_HIDE           : ++X_Event_last,
-	PAGE_AFTER_HIDE     : ++X_Event_last,
+	PAGE_HIDE_AFTER     : ++X_Event_last,
 
 	// X.UI.Form
-	CHANGE            : ++X_Event_last,
-	SUBMIT            : ++X_Event_last,
-	SELECT            : ++X_Event_last, // click or tap or enterkey
+	CHANGE              : ++X_Event_last,
+	SUBMIT              : ++X_Event_last,
+	SELECT              : ++X_Event_last, // click or tap or enterkey
+	
+	ITEMDATA_CHANGED    : ++X_Event_last,
 	
 	IdToName : {},
 	NameToID : {}
 };
 
-// raw pointing device event
-//if( X_UA_HID.POINTER ){
-	X.UI.Event.IdToName[ X.UI.Event._POINTER_DOWN   ] = 'pointerdown';
-	X.UI.Event.IdToName[ X.UI.Event._POINTER_UP     ] = 'pointerup';
-	X.UI.Event.IdToName[ X.UI.Event._POINTER_MOVE   ] = 'pointermove';
-	X.UI.Event.IdToName[ X.UI.Event._POINTER_CANCEL ] = 'pointercancel';
-/*} else {
-	
-	if( X_UA_HID.TOUCH ){
-		X.UI.Event.IdToName[ X.UI.Event._TOUCH_START  ] = 'touchstart';
-		X.UI.Event.IdToName[ X.UI.Event._TOUCH_END    ] = 'touchend';
-		X.UI.Event.IdToName[ X.UI.Event._TOUCH_MOVE   ] = 'touchmove';
-		X.UI.Event.IdToName[ X.UI.Event._TOUCH_CANCEL ] = 'touchcancel';
-	};
+	XUI_Event.IdToName[ XUI_Event._POINTER_DOWN   ] = 'pointerdown';
+	XUI_Event.IdToName[ XUI_Event._POINTER_UP     ] = 'pointerup';
+	XUI_Event.IdToName[ XUI_Event._POINTER_MOVE   ] = 'pointermove';
+	XUI_Event.IdToName[ XUI_Event._POINTER_CANCEL ] = 'pointercancel';
 
-	X.UI.Event.IdToName[ X.UI.Event._MOUSE_DOWN   ] = 'mousedown';
-	X.UI.Event.IdToName[ X.UI.Event._MOUSE_UP     ] = 'mouseup';
-	X.UI.Event.IdToName[ X.UI.Event._MOUSE_MOVE   ] = 'mousemove';
-	X.UI.Event.IdToName[ X.UI.Event._MOUSE_CANCEL ] = 'mouseleave'; // ??
-};*/
 
 
 ( function( IdToName, NameToID, p ){
 	for( p in IdToName ){
-		NameToID[ IdToName[ p ] ] = p;
+		// if( X_EMPTY_OBJECT[ p ] ) continue;
+		NameToID[ IdToName[ p ] ] = parseFloat( p );
 	};
-})( X.UI.Event.IdToName, X.UI.Event.NameToID );
+})( XUI_Event.IdToName, XUI_Event.NameToID );