X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=0.6.x%2Fjs%2F01_core%2F14_XEvent.js;h=1771ecc9366b6a1065ccaf2fa7d73e249f4c430f;hb=4e4ab3be10850546063d4a4b93250ed142bb8cd2;hp=48f5b725c99ad2ebe2361de2771aba26d3e5a417;hpb=86581b41630966e02d93bc37bc221c5fc55f5322;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 48f5b72..1771ecc 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,7 +112,7 @@ 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_MEDIA_WAIT_FOR_TOUCH   = 49,
 	
 	X_EVENT_NEED_AUTH              = 50,
 	
@@ -223,7 +228,7 @@ 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,
+	'MEDIA_WAIT_FOR_TOUCH'   : X_EVENT_MEDIA_WAIT_FOR_TOUCH,
 	
 	'NEED_AUTH'              : X_EVENT_NEED_AUTH,