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=522959bdaef9219406739718cde63f818ef7cefb;hpb=24f935c7a129b0a00d800e4983da6491a913aeef;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 522959b..1771ecc 100644
--- a/0.6.x/js/01_core/14_XEvent.js
+++ b/0.6.x/js/01_core/14_XEvent.js
@@ -12,8 +12,8 @@ var X_Event_Rename    = {},
 			IFRAMEload_proxy : function( e ){
 				var raw = this[ '_rawObject' ];
 				
-				return raw.readyState === 'complete' || raw.readyState === 'loaded' ?
-					 	this[ 'dispatch' ]( 'load' ) : X_Callback_PREVENT_DEFAULT, X_Callback_STOP_PROPAGATION;
+				return ( raw.readyState === 'complete' || raw.readyState === 'loaded' ) ?
+					 	this[ 'dispatch' ]( 'load' ) : X_CALLBACK_PREVENT_DEFAULT | X_CALLBACK_STOP_PROPAGATION;
 			},
 		
 		// X_UA[ 'Opera' ]
@@ -22,7 +22,7 @@ var X_Event_Rename    = {},
 		},
 		
 			contextmenu_proxy : function( e ){
-				return e.button === 2 ? this[ 'dispatch' ]( 'contextmenu' ) : X_Callback_NONE;
+				return e.button === 2 ? this[ 'dispatch' ]( 'contextmenu' ) : X_CALLBACK_NONE;
 			}
 	},
 	
@@ -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'
@@ -54,7 +59,6 @@ var // 内部イベント
 	X_EVENT_INIT                   =  7,
 
 	// 公開イベント
-	/* @const */
 	X_EVENT_XDOM_READY             =  8,
 	
 	X_EVENT_COMPLETE               =  9,
@@ -66,11 +70,8 @@ var // 内部イベント
 	X_EVENT_CANCELED               = 15,
 	X_EVENT_TIMEOUT                = 16,
 
-	/* @const */
 	X_EVENT_BEFORE_KILL_INSTANCE   = 17,
-	/* @const */
 	X_EVENT_KILL_INSTANCE_CANCELED = 18,
-	/* @const */
 	X_EVENT_KILL_INSTANCE          = 19,
 	
 	X_EVENT_VIEW_ACTIVATE          = 20,
@@ -111,18 +112,24 @@ var // 内部イベント
 	X_EVENT_MEDIA_ENDED            = 46,
 	X_EVENT_MEDIA_WAITING          = 47,
 	X_EVENT_MEDIA_SEEKING          = 48,
+	X_EVENT_MEDIA_WAIT_FOR_TOUCH   = 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
+// on_screen_keyboard_hide
 
 /**
  * フレームワーク内で定義されたイベント。
  * @namespace X.Event
- * @alias X.Event
- * @enum {number}
  */
-X[ 'Event' ] = {
+X[ 'Event' ] = /** @lends X.Event */
+{
 	/**
 	 * X.ViewPort で発生する。DomContentLoaded に相当。document.body.innerHTML の内容から X.Node ツリーの作成が完了した。
 	 * このイベント以降、X.Doc.create(), X.Doc.find() 等が可能になる。
@@ -172,10 +179,6 @@ X[ 'Event' ] = {
 	 */
 	'BASE_FONT_RESIZED'      : X_EVENT_BASE_FONT_RESIZED,
 
-// in_page_jump
-// on_screen_keyboard_show
-// on_screen_keyboard_hide
-
 	/**
 	 * X_System で発生する。このイベントで要素のサイズを取得すると無限ループに！
 	 */
@@ -225,8 +228,11 @@ X[ 'Event' ] = {
 	'MEDIA_ENDED'            : X_EVENT_MEDIA_ENDED,
 	'MEDIA_WAITING'          : X_EVENT_MEDIA_WAITING,
 	'MEDIA_SEEKING'          : X_EVENT_MEDIA_SEEKING,
+	'MEDIA_WAIT_FOR_TOUCH'   : X_EVENT_MEDIA_WAIT_FOR_TOUCH,
+	
+	'NEED_AUTH'              : X_EVENT_NEED_AUTH,
 	
-	'NEED_AUTH'              : X_EVENT_NEED_AUTH
+	'DEBUG'                  : X_EVENT_DEBUG
 };
 
 X_TEMP.onSystemReady.push(