X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=0.6.x%2Fjs%2F01_core%2F14_XEvent.js;h=fa236ac0c95adf42988c74ff76c3c92ddf8fdcce;hb=a205577d1e16a34301f1199dcf9c699aa2c37fb9;hp=e2a5cdae7511f193b99bbb6873d73bcc29162625;hpb=1ed2190f012cf923f7e48d3c0d122aa56c56c5f3;p=pettanr%2FclientJs.git

diff --git a/0.6.x/js/01_core/14_XEvent.js b/0.6.x/js/01_core/14_XEvent.js
index e2a5cda..fa236ac 100644
--- a/0.6.x/js/01_core/14_XEvent.js
+++ b/0.6.x/js/01_core/14_XEvent.js
@@ -34,6 +34,9 @@ var X_Event_Rename    = {},
 			'mouseup'     : 'pointerup',
 			'touchmove'   : 'pointermove',
 			'mousemove'   : 'pointermove',
+			'touchleave'  : 'pointerleave',
+			'mouseout'    : 'pointerout',
+			'mouseleave'  : 'pointerleave',
 			'touchcancel' : 'pointercancel',
 			'contextmenu' : 'contextmenu',
 			'dbclick'     : 'dbclick',
@@ -43,6 +46,8 @@ var X_Event_Rename    = {},
 			'mousedown'   : 'pointerdown',
 			'mouseup'     : 'pointerup',
 			'mousemove'   : 'pointermove',
+			'mouseout'    : 'pointerout',
+			'mouseleave'  : 'pointerleave',
 			'contextmenu' : 'contextmenu',
 			'dbclick'     : 'dbclick',
 			'click'       : 'click'
@@ -107,10 +112,13 @@ var // 内部イベント
 	X_EVENT_MEDIA_ENDED            = 46,
 	X_EVENT_MEDIA_WAITING          = 47,
 	X_EVENT_MEDIA_SEEKING          = 48,
+	X_EVENT_MEDIA_TOUCH_FOR_LOAD   = 49,
 	
-	X_EVENT_NEED_AUTH              = 49,
+	X_EVENT_NEED_AUTH              = 50,
 	
-	X_Event_last                   = 49;
+	X_EVENT_DEBUG                  = 51,
+	
+	X_Event_last                   = 51;
 
 // in_page_jump
 // on_screen_keyboard_show
@@ -220,8 +228,11 @@ X[ 'Event' ] = /** @lends X.Event */
 	'MEDIA_ENDED'            : X_EVENT_MEDIA_ENDED,
 	'MEDIA_WAITING'          : X_EVENT_MEDIA_WAITING,
 	'MEDIA_SEEKING'          : X_EVENT_MEDIA_SEEKING,
+	'MEDIA_TOUCH_FOR_LOAD'   : X_EVENT_MEDIA_TOUCH_FOR_LOAD,
+	
+	'NEED_AUTH'              : X_EVENT_NEED_AUTH,
 	
-	'NEED_AUTH'              : X_EVENT_NEED_AUTH
+	'DEBUG'                  : X_EVENT_DEBUG
 };
 
 X_TEMP.onSystemReady.push(