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 0c52605..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
@@ -13,9 +15,11 @@ var X_Event_Rename    = {},
                                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
+                                               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
@@ -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
@@ -107,7 +116,7 @@ var // 内部イベント
        X_EVENT_MEDIA_ENDED            = 46,\r
        X_EVENT_MEDIA_WAITING          = 47,\r
        X_EVENT_MEDIA_SEEKING          = 48,\r
-       X_EVENT_MEDIA_CAN_TOUCH_LOAD   = 49,\r
+       X_EVENT_MEDIA_WAIT_FOR_TOUCH   = 49,\r
        \r
        X_EVENT_NEED_AUTH              = 50,\r
        \r
@@ -223,7 +232,7 @@ X[ 'Event' ] = /** @lends X.Event */
        'MEDIA_ENDED'            : X_EVENT_MEDIA_ENDED,\r
        'MEDIA_WAITING'          : X_EVENT_MEDIA_WAITING,\r
        'MEDIA_SEEKING'          : X_EVENT_MEDIA_SEEKING,\r
-       'MEDIA_CAN_TOUCH_LOAD'   : X_EVENT_MEDIA_CAN_TOUCH_LOAD,\r
+       'MEDIA_WAIT_FOR_TOUCH'   : X_EVENT_MEDIA_WAIT_FOR_TOUCH,\r
        \r
        'NEED_AUTH'              : X_EVENT_NEED_AUTH,\r
        \r