Fix the bug of X.NodeAnime.

[pettanr/clientJs.git] / 0.6.x / js / 01_core / 14_XEvent.js

diff --git a/0.6.x/js/01_core/14_XEvent.js b/0.6.x/js/01_core/14_XEvent.js
index 522959b..99991aa 100644 (file)
--- a/0.6.x/js/01_core/14_XEvent.js
+++ b/0.6.x/js/01_core/14_XEvent.js
@@ -3,6 +3,8 @@ var X_Event_Rename    = {},
        X_Event_RenameTo  = {},\r
        \r
        // TODO IFRAMEload, SCRIPTload, LINKload raw.readyState !== 'complete' && raw.readyState !== 'loaded' && this.dispatch( 'load' )\r
+       \r
+       \r
        X_Event_proxy     = {\r
                \r
                'IFRAMEload' : function( eventDispatcher ){\r
@@ -12,17 +14,19 @@ var X_Event_Rename    = {},
                        IFRAMEload_proxy : function( e ){\r
                                var raw = this[ '_rawObject' ];\r
                                \r
-                               return raw.readyState === 'complete' || raw.readyState === 'loaded' ?\r
-                                               this[ 'dispatch' ]( 'load' ) : X_Callback_PREVENT_DEFAULT, X_Callback_STOP_PROPAGATION;\r
+                               return ( raw.readyState === 'complete' || raw.readyState === 'loaded' ) ?\r
+                                               X_EventDispatcher_actualHandleEvent( 'load' ) : X_CALLBACK_PREVENT_DEFAULT | X_CALLBACK_STOP_PROPAGATION;\r
                        },\r
                \r
+               // TODO  focusin focusout\r
+               \r
                // X_UA[ 'Opera' ]\r
                'contextmenu' : function( eventDispatcher ){\r
                        eventDispatcher[ 'listen' ]( 'mousedown', contextmenu_proxy );\r
                },\r
                \r
                        contextmenu_proxy : function( e ){\r
-                               return e.button === 2 ? this[ 'dispatch' ]( 'contextmenu' ) : X_Callback_NONE;\r
+                               return e.button === 2 ? this[ 'dispatch' ]( 'contextmenu' ) : X_CALLBACK_NONE;\r
                        }\r
        },\r
        \r
@@ -34,6 +38,9 @@ var X_Event_Rename    = {},
                        'mouseup'     : 'pointerup',\r
                        'touchmove'   : 'pointermove',\r
                        'mousemove'   : 'pointermove',\r
+                       'touchleave'  : 'pointerleave',\r
+                       'mouseout'    : 'pointerout',\r
+                       'mouseleave'  : 'pointerleave',\r
                        'touchcancel' : 'pointercancel',\r
                        'contextmenu' : 'contextmenu',\r
                        'dbclick'     : 'dbclick',\r
@@ -43,6 +50,8 @@ var X_Event_Rename    = {},
                        'mousedown'   : 'pointerdown',\r
                        'mouseup'     : 'pointerup',\r
                        'mousemove'   : 'pointermove',\r
+                       'mouseout'    : 'pointerout',\r
+                       'mouseleave'  : 'pointerleave',\r
                        'contextmenu' : 'contextmenu',\r
                        'dbclick'     : 'dbclick',\r
                        'click'       : 'click'\r
@@ -54,7 +63,6 @@ var // 内部イベント
        X_EVENT_INIT                   =  7,\r
 \r
        // 公開イベント\r
-       /* @const */\r
        X_EVENT_XDOM_READY             =  8,\r
        \r
        X_EVENT_COMPLETE               =  9,\r
@@ -66,11 +74,8 @@ var // 内部イベント
        X_EVENT_CANCELED               = 15,\r
        X_EVENT_TIMEOUT                = 16,\r
 \r
-       /* @const */\r
        X_EVENT_BEFORE_KILL_INSTANCE   = 17,\r
-       /* @const */\r
        X_EVENT_KILL_INSTANCE_CANCELED = 18,\r
-       /* @const */\r
        X_EVENT_KILL_INSTANCE          = 19,\r
        \r
        X_EVENT_VIEW_ACTIVATE          = 20,\r
@@ -111,18 +116,24 @@ var // 内部イベント
        X_EVENT_MEDIA_ENDED            = 46,\r
        X_EVENT_MEDIA_WAITING          = 47,\r
        X_EVENT_MEDIA_SEEKING          = 48,\r
+       X_EVENT_MEDIA_WAIT_FOR_TOUCH   = 49,\r
+       \r
+       X_EVENT_NEED_AUTH              = 50,\r
        \r
-       X_EVENT_NEED_AUTH              = 49,\r
+       X_EVENT_DEBUG                  = 51,\r
        \r
-       X_Event_last                   = 49;\r
+       X_Event_last                   = 51;\r
+\r
+// in_page_jump\r
+// on_screen_keyboard_show\r
+// on_screen_keyboard_hide\r
 \r
 /**\r
  * フレームワーク内で定義されたイベント。\r
  * @namespace X.Event\r
- * @alias X.Event\r
- * @enum {number}\r
  */\r
-X[ 'Event' ] = {\r
+X[ 'Event' ] = /** @lends X.Event */\r
+{\r
        /**\r
         * X.ViewPort で発生する。DomContentLoaded に相当。document.body.innerHTML の内容から X.Node ツリーの作成が完了した。\r
         * このイベント以降、X.Doc.create(), X.Doc.find() 等が可能になる。\r
@@ -172,10 +183,6 @@ X[ 'Event' ] = {
         */\r
        'BASE_FONT_RESIZED'      : X_EVENT_BASE_FONT_RESIZED,\r
 \r
-// in_page_jump\r
-// on_screen_keyboard_show\r
-// on_screen_keyboard_hide\r
-\r
        /**\r
         * X_System で発生する。このイベントで要素のサイズを取得すると無限ループに！\r
         */\r
@@ -225,8 +232,11 @@ X[ 'Event' ] = {
        'MEDIA_ENDED'            : X_EVENT_MEDIA_ENDED,\r
        'MEDIA_WAITING'          : X_EVENT_MEDIA_WAITING,\r
        'MEDIA_SEEKING'          : X_EVENT_MEDIA_SEEKING,\r
+       'MEDIA_WAIT_FOR_TOUCH'   : X_EVENT_MEDIA_WAIT_FOR_TOUCH,\r
+       \r
+       'NEED_AUTH'              : X_EVENT_NEED_AUTH,\r
        \r
-       'NEED_AUTH'              : X_EVENT_NEED_AUTH\r
+       'DEBUG'                  : X_EVENT_DEBUG\r
 };\r
 \r
 X_TEMP.onSystemReady.push(\r