X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=0.6.x%2Fjs%2Fui%2F04_XUI_Event.js;h=c50ca7f51336a5f7297a089daa686482f46a1d0b;hb=4e5a06c9c610f8d3777f9d2eef71ec1365ffff1b;hp=1190ff651e271aa9a6195e7251dce37ff71ee543;hpb=d4a9a51a78712817a3a4bbfd9a09e9ddccc9aaf0;p=pettanr%2FclientJs.git

diff --git a/0.6.x/js/ui/04_XUI_Event.js b/0.6.x/js/ui/04_XUI_Event.js
index 1190ff6..c50ca7f 100644
--- a/0.6.x/js/ui/04_XUI_Event.js
+++ b/0.6.x/js/ui/04_XUI_Event.js
@@ -1,21 +1,18 @@
 
-
-X.UI.i = X.Dom.Event._LAST_EVENT;
-
 X.UI.Event = {
 
-	INIT              : ++X.UI.i,
-	ADDED             : ++X.UI.i,
-	CREATION_COMPLETE : ++X.UI.i,
-	REMOVED           : ++X.UI.i,
+	INIT              : ++X.Dom.Event._LAST_EVENT,
+	ADDED             : ++X.Dom.Event._LAST_EVENT,
+	CREATION_COMPLETE : ++X.Dom.Event._LAST_EVENT,
+	REMOVED           : ++X.Dom.Event._LAST_EVENT,
 
 	// http://d.hatena.ne.jp/edvakf/20100205/1265338487
 	// http://d.hatena.ne.jp/uupaa/20100401/1270097629
-	ENTER_VIEW        : ++X.UI.i, // 要素が視界に入った
-	OUT_VIEW          : ++X.UI.i,
+	ENTER_VIEW        : ++X.Dom.Event._LAST_EVENT, // 要素が視界に入った
+	OUT_VIEW          : ++X.Dom.Event._LAST_EVENT,
 	
-	POINTER_OUT       : ++X.UI.i,
-	POINTER_IN        : ++X.UI.i,
+	POINTER_OUT       : ++X.Dom.Event._LAST_EVENT,
+	POINTER_IN        : ++X.Dom.Event._LAST_EVENT,
 	
 	// FOCUS
 	// DISABLED
@@ -23,135 +20,135 @@ X.UI.Event = {
 	// BASE_FONT_SIZE_CHANGE
 	
 /* -- Pointing Device Event -- */
-	_START_POINTER    : X.UI.i + 0.5,
+	_START_POINTER    : X.Dom.Event._LAST_EVENT + 0.5,
 	
-	CONTEXT_MENU      : ++X.UI.i, // rightclick or longtouch or menukey or ctrl + click
+	CONTEXT_MENU      : ++X.Dom.Event._LAST_EVENT, // rightclick or longtouch or menukey or ctrl + click
 	
 /* -- ここよりあとはノード上をバブルアップ	-- */
-	_START_BUBLEUP    : X.UI.i + 0.5,		
+	_START_BUBLEUP    : X.Dom.Event._LAST_EVENT + 0.5,		
 
 	// raw pointing device event
-	_POINTER_DOWN     : ++X.UI.i,
-	_POINTER_UP       : ++X.UI.i,
-	_POINTER_MOVE     : ++X.UI.i,
-	_POINTER_CANCEL   : ++X.UI.i,
-	_TOUCH_START      : ++X.UI.i,
-	_TOUCH_END        : ++X.UI.i,
-	_TOUCH_MOVE       : ++X.UI.i,
-	_TOUCH_CANCEL     : ++X.UI.i,
-	_MOUSE_DOWN       : ++X.UI.i,
-	_MOUSE_UP         : ++X.UI.i,
-	_MOUSE_MOVE       : ++X.UI.i,
-	_MOUSE_CANCEL     : ++X.UI.i,
+	_POINTER_DOWN     : ++X.Dom.Event._LAST_EVENT,
+	_POINTER_UP       : ++X.Dom.Event._LAST_EVENT,
+	_POINTER_MOVE     : ++X.Dom.Event._LAST_EVENT,
+	_POINTER_CANCEL   : ++X.Dom.Event._LAST_EVENT,
+	_TOUCH_START      : ++X.Dom.Event._LAST_EVENT,
+	_TOUCH_END        : ++X.Dom.Event._LAST_EVENT,
+	_TOUCH_MOVE       : ++X.Dom.Event._LAST_EVENT,
+	_TOUCH_CANCEL     : ++X.Dom.Event._LAST_EVENT,
+	_MOUSE_DOWN       : ++X.Dom.Event._LAST_EVENT,
+	_MOUSE_UP         : ++X.Dom.Event._LAST_EVENT,
+	_MOUSE_MOVE       : ++X.Dom.Event._LAST_EVENT,
+	_MOUSE_CANCEL     : ++X.Dom.Event._LAST_EVENT,
 	
-	FILE_DRAG         : ++X.UI.i,
-	FILE_DRAG_START   : ++X.UI.i,
-	FILE_DRAG_END     : ++X.UI.i,
-	FILE_HOLD         : ++X.UI.i,
-	FILE_HOLD_END     : ++X.UI.i,
-	FILE_DROP_BEFORE  : ++X.UI.i,
-	FILE_DROP         : ++X.UI.i,
-	FILE_DROP_CANCEL  : ++X.UI.i,
+	FILE_DRAG         : ++X.Dom.Event._LAST_EVENT,
+	FILE_DRAG_START   : ++X.Dom.Event._LAST_EVENT,
+	FILE_DRAG_END     : ++X.Dom.Event._LAST_EVENT,
+	FILE_HOLD         : ++X.Dom.Event._LAST_EVENT,
+	FILE_HOLD_END     : ++X.Dom.Event._LAST_EVENT,
+	FILE_DROP_BEFORE  : ++X.Dom.Event._LAST_EVENT,
+	FILE_DROP         : ++X.Dom.Event._LAST_EVENT,
+	FILE_DROP_CANCEL  : ++X.Dom.Event._LAST_EVENT,
 
 /* -- ここより後は X.UI 用のイベント -- */
-	_START_XUI_EVENT  : X.UI.i + 0.5,
+	_START_XUI_EVENT  : X.Dom.Event._LAST_EVENT + 0.5,
 
 /* -- Mouse & Floating touch(Xperia sola)?? -- */
-	HOVER_MOVE        : ++X.UI.i,
-	HOVER_STAY        : ++X.UI.i,
-	HOVER_STAY_END    : ++X.UI.i,
-	WHEEL             : ++X.UI.i,
+	HOVER_MOVE        : ++X.Dom.Event._LAST_EVENT,
+	HOVER_STAY        : ++X.Dom.Event._LAST_EVENT,
+	HOVER_STAY_END    : ++X.Dom.Event._LAST_EVENT,
+	WHEEL             : ++X.Dom.Event._LAST_EVENT,
 
 /* -- Gesuture Event -- */
-	HOLD              : ++X.UI.i,
-	HOLD_END          : ++X.UI.i,
-	TAP               : ++X.UI.i,
-	DOUBLE_TAP        : ++X.UI.i,
-	DRAG              : ++X.UI.i,
-	DRAG_START        : ++X.UI.i,
-	DRAG_END          : ++X.UI.i,
-	DRAG_UP           : ++X.UI.i,
-	DRAG_RIGHT        : ++X.UI.i,
-	DRAG_LEFT         : ++X.UI.i,
-	DRAG_DOWN         : ++X.UI.i,
-	SWIP              : ++X.UI.i,
-	SWIP_UP           : ++X.UI.i,
-	SWIP_RIGHT        : ++X.UI.i,
-	SWIP_LEFT         : ++X.UI.i,		
-	SWIP_DOWN         : ++X.UI.i,
-	TRANSFORM         : ++X.UI.i,
-	TRANSFORM_START   : ++X.UI.i,
-	TRANSFORM_END     : ++X.UI.i,
-	PINCH             : ++X.UI.i,
-	PINCH_IN          : ++X.UI.i,
-	PINCH_OUT         : ++X.UI.i,
-	ROTATE            : ++X.UI.i,
+	HOLD              : ++X.Dom.Event._LAST_EVENT,
+	HOLD_END          : ++X.Dom.Event._LAST_EVENT,
+	TAP               : ++X.Dom.Event._LAST_EVENT,
+	DOUBLE_TAP        : ++X.Dom.Event._LAST_EVENT,
+	DRAG              : ++X.Dom.Event._LAST_EVENT,
+	DRAG_START        : ++X.Dom.Event._LAST_EVENT,
+	DRAG_END          : ++X.Dom.Event._LAST_EVENT,
+	DRAG_UP           : ++X.Dom.Event._LAST_EVENT,
+	DRAG_RIGHT        : ++X.Dom.Event._LAST_EVENT,
+	DRAG_LEFT         : ++X.Dom.Event._LAST_EVENT,
+	DRAG_DOWN         : ++X.Dom.Event._LAST_EVENT,
+	SWIP              : ++X.Dom.Event._LAST_EVENT,
+	SWIP_UP           : ++X.Dom.Event._LAST_EVENT,
+	SWIP_RIGHT        : ++X.Dom.Event._LAST_EVENT,
+	SWIP_LEFT         : ++X.Dom.Event._LAST_EVENT,		
+	SWIP_DOWN         : ++X.Dom.Event._LAST_EVENT,
+	TRANSFORM         : ++X.Dom.Event._LAST_EVENT,
+	TRANSFORM_START   : ++X.Dom.Event._LAST_EVENT,
+	TRANSFORM_END     : ++X.Dom.Event._LAST_EVENT,
+	PINCH             : ++X.Dom.Event._LAST_EVENT,
+	PINCH_IN          : ++X.Dom.Event._LAST_EVENT,
+	PINCH_OUT         : ++X.Dom.Event._LAST_EVENT,
+	ROTATE            : ++X.Dom.Event._LAST_EVENT,
 	
-	_END_XUI_EVENT    : X.UI.i + 0.5,
+	_END_XUI_EVENT    : X.Dom.Event._LAST_EVENT + 0.5,
 	
-	_END_POINTER      : X.UI.i + 0.5,
+	_END_POINTER      : X.Dom.Event._LAST_EVENT + 0.5,
 /* -- Pointing Device Event -- */
 	
-	KEY_DOWN          : ++X.UI.i,
-	KEY_UP            : ++X.UI.i,
-	KEY_HOLD          : ++X.UI.i,
-	KEY_CANCEL        : ++X.UI.i,
+	KEY_DOWN          : ++X.Dom.Event._LAST_EVENT,
+	KEY_UP            : ++X.Dom.Event._LAST_EVENT,
+	KEY_HOLD          : ++X.Dom.Event._LAST_EVENT,
+	KEY_CANCEL        : ++X.Dom.Event._LAST_EVENT,
 	
-	SCROLL_BEFORE_START : ++X.UI.i, // cancelable
-	SCROLL_START        : ++X.UI.i,
-	SCROLL_BEFORE_MOVE  : ++X.UI.i,
-	SCROLL_MOVE         : ++X.UI.i,
-	SCROLL_END          : ++X.UI.i,
-	SCROLL_REFRESH      : ++X.UI.i,
-
-	ANIME_BEFORE_START  : ++X.UI.i,
-	ANIME_START         : ++X.UI.i,
-	ANIME               : ++X.UI.i,
-	ANIME_END           : ++X.UI.i,
-	ANIME_BEFORE_STOP   : ++X.UI.i, // before cancel
-	ANIME_STOP          : ++X.UI.i,
-
-	PAGE_BEFORE_SHOW    : ++X.UI.i,
-	PAGE_SHOW           : ++X.UI.i,
-	PAGE_AFTER_SHOW     : ++X.UI.i,
-	PAGE_BEFORE_HIDE    : ++X.UI.i,
-	PAGE_HIDE           : ++X.UI.i,
-	PAGE_AFTER_HIDE     : ++X.UI.i,
+	SCROLL_BEFORE_START : ++X.Dom.Event._LAST_EVENT, // cancelable
+	SCROLL_START        : ++X.Dom.Event._LAST_EVENT,
+	SCROLL_BEFORE_MOVE  : ++X.Dom.Event._LAST_EVENT,
+	SCROLL_MOVE         : ++X.Dom.Event._LAST_EVENT,
+	SCROLL_END          : ++X.Dom.Event._LAST_EVENT,
+	SCROLL_REFRESH      : ++X.Dom.Event._LAST_EVENT,
+
+	ANIME_BEFORE_START  : ++X.Dom.Event._LAST_EVENT,
+	ANIME_START         : ++X.Dom.Event._LAST_EVENT,
+	ANIME               : ++X.Dom.Event._LAST_EVENT,
+	ANIME_END           : ++X.Dom.Event._LAST_EVENT,
+	ANIME_BEFORE_STOP   : ++X.Dom.Event._LAST_EVENT, // before cancel
+	ANIME_STOP          : ++X.Dom.Event._LAST_EVENT,
+
+	PAGE_BEFORE_SHOW    : ++X.Dom.Event._LAST_EVENT,
+	PAGE_SHOW           : ++X.Dom.Event._LAST_EVENT,
+	PAGE_AFTER_SHOW     : ++X.Dom.Event._LAST_EVENT,
+	PAGE_BEFORE_HIDE    : ++X.Dom.Event._LAST_EVENT,
+	PAGE_HIDE           : ++X.Dom.Event._LAST_EVENT,
+	PAGE_AFTER_HIDE     : ++X.Dom.Event._LAST_EVENT,
 
 	// X.UI.Form
-	CHANGE            : ++X.UI.i,
-	SUBMIT            : ++X.UI.i,
-	SELECT            : ++X.UI.i, // click or tap or enterkey
+	CHANGE            : ++X.Dom.Event._LAST_EVENT,
+	SUBMIT            : ++X.Dom.Event._LAST_EVENT,
+	SELECT            : ++X.Dom.Event._LAST_EVENT, // click or tap or enterkey
 	
 	IdToName : {},
 	NameToID : {}
 };
 
-delete X.UI.i;
-
 // raw pointing device event
-if( navigator.msPointerEnabled || navigator.pointerEnabled ){
-	X.UI.Event.IdToName[ X.UI.Event._POINTER_DOWN   ] = navigator.msPointerEnabled ? 'MSPointerDown'   : 'pointerdown';
-	X.UI.Event.IdToName[ X.UI.Event._POINTER_UP     ] = navigator.msPointerEnabled ? 'MSPointerUp'     : 'pointerup';
-	X.UI.Event.IdToName[ X.UI.Event._POINTER_MOVE   ] = navigator.msPointerEnabled ? 'MSPointerMove'   : 'pointermove';
-	X.UI.Event.IdToName[ X.UI.Event._POINTER_CANCEL ] = navigator.msPointerEnabled ? 'MSPointerCancel' : 'pointercancel';
-};// else
-//if( window.ontouchstart !== void 0 /* || window.DocumentTouch && document instanceof DocumentTouch */ ){
-	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';
-//} else {
-	// ToDo: cancel	
+if( X.Dom.EVENT_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.Dom.EVENT_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';
+	};
+
 	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 ){
-	for( var id in IdToName ){
-		NameToID[ IdToName[ id ] ] = id;
+( function( IdToName, NameToID, p ){
+	for( p in IdToName ){
+		NameToID[ IdToName[ p ] ] = p;
 	};
 })( X.UI.Event.IdToName, X.UI.Event.NameToID );