Version 0.6.190, fix X.UI.ScrollBox & X.UI.Gesture.

[pettanr/clientJs.git] / 0.6.x / js / 20_ui / 04_XUI_Event.js

diff --git a/0.6.x/js/20_ui/04_XUI_Event.js b/0.6.x/js/20_ui/04_XUI_Event.js
index 1f1c85f..afd289f 100644 (file)
--- a/0.6.x/js/20_ui/04_XUI_Event.js
+++ b/0.6.x/js/20_ui/04_XUI_Event.js
@@ -1,15 +1,18 @@
 \r
-X.UI.Event = {\r
+var XUI_Event = X[ 'UI' ][ 'Event' ] = {\r
 \r
        INIT              : ++X_Event_last,\r
        ADDED             : ++X_Event_last,\r
        CREATION_COMPLETE : ++X_Event_last,\r
        REMOVED           : ++X_Event_last,\r
 \r
+       LAYOUT_BEFORE     : ++X_Event_last,\r
+       LAYOUT_COMPLETE   : ++X_Event_last,\r
+\r
        // http://d.hatena.ne.jp/edvakf/20100205/1265338487\r
        // http://d.hatena.ne.jp/uupaa/20100401/1270097629\r
-       ENTER_VIEW        : ++X_Event_last, // 要素が視界に入った\r
-       OUT_VIEW          : ++X_Event_last,\r
+       VIEW_IN           : ++X_Event_last, // 要素が視界に入った\r
+       VIEW_OUT          : ++X_Event_last,\r
        \r
        POINTER_OUT       : ++X_Event_last,\r
        POINTER_IN        : ++X_Event_last,\r
@@ -28,19 +31,10 @@ X.UI.Event = {
        _START_BUBLEUP    : X_Event_last + 0.5,         \r
 \r
        // raw pointing device event\r
-       \r
        _POINTER_DOWN     : ++X_Event_last,\r
+       _POINTER_MOVE     : ++X_Event_last,     \r
        _POINTER_UP       : ++X_Event_last,\r
-       _POINTER_MOVE     : ++X_Event_last,\r
        _POINTER_CANCEL   : ++X_Event_last,\r
-       _TOUCH_START      : ++X_Event_last,\r
-       _TOUCH_END        : ++X_Event_last,\r
-       _TOUCH_MOVE       : ++X_Event_last,\r
-       _TOUCH_CANCEL     : ++X_Event_last,\r
-       _MOUSE_DOWN       : ++X_Event_last,\r
-       _MOUSE_UP         : ++X_Event_last,\r
-       _MOUSE_MOVE       : ++X_Event_last,\r
-       _MOUSE_CANCEL     : ++X_Event_last,\r
        \r
        FILE_DRAG         : ++X_Event_last,\r
        FILE_DRAG_START   : ++X_Event_last,\r
@@ -117,39 +111,27 @@ X.UI.Event = {
        PAGE_AFTER_HIDE     : ++X_Event_last,\r
 \r
        // X.UI.Form\r
-       CHANGE            : ++X_Event_last,\r
-       SUBMIT            : ++X_Event_last,\r
-       SELECT            : ++X_Event_last, // click or tap or enterkey\r
+       CHANGE              : ++X_Event_last,\r
+       SUBMIT              : ++X_Event_last,\r
+       SELECT              : ++X_Event_last, // click or tap or enterkey\r
+       \r
+       ITEMDATA_CHANGED    : ++X_Event_last,\r
        \r
        IdToName : {},\r
        NameToID : {}\r
 };\r
 \r
-// raw pointing device event\r
-//if( X_UA_HID.POINTER ){\r
-       X.UI.Event.IdToName[ X.UI.Event._POINTER_DOWN   ] = 'pointerdown';\r
-       X.UI.Event.IdToName[ X.UI.Event._POINTER_UP     ] = 'pointerup';\r
-       X.UI.Event.IdToName[ X.UI.Event._POINTER_MOVE   ] = 'pointermove';\r
-       X.UI.Event.IdToName[ X.UI.Event._POINTER_CANCEL ] = 'pointercancel';\r
-/*} else {\r
-       \r
-       if( X_UA_HID.TOUCH ){\r
-               X.UI.Event.IdToName[ X.UI.Event._TOUCH_START  ] = 'touchstart';\r
-               X.UI.Event.IdToName[ X.UI.Event._TOUCH_END    ] = 'touchend';\r
-               X.UI.Event.IdToName[ X.UI.Event._TOUCH_MOVE   ] = 'touchmove';\r
-               X.UI.Event.IdToName[ X.UI.Event._TOUCH_CANCEL ] = 'touchcancel';\r
-       };\r
+       XUI_Event.IdToName[ XUI_Event._POINTER_DOWN   ] = 'pointerdown';\r
+       XUI_Event.IdToName[ XUI_Event._POINTER_UP     ] = 'pointerup';\r
+       XUI_Event.IdToName[ XUI_Event._POINTER_MOVE   ] = 'pointermove';\r
+       XUI_Event.IdToName[ XUI_Event._POINTER_CANCEL ] = 'pointercancel';\r
 \r
-       X.UI.Event.IdToName[ X.UI.Event._MOUSE_DOWN   ] = 'mousedown';\r
-       X.UI.Event.IdToName[ X.UI.Event._MOUSE_UP     ] = 'mouseup';\r
-       X.UI.Event.IdToName[ X.UI.Event._MOUSE_MOVE   ] = 'mousemove';\r
-       X.UI.Event.IdToName[ X.UI.Event._MOUSE_CANCEL ] = 'mouseleave'; // ??\r
-};*/\r
 \r
 \r
 ( function( IdToName, NameToID, p ){\r
        for( p in IdToName ){\r
-               NameToID[ IdToName[ p ] ] = p;\r
+               // if( X_EMPTY_OBJECT[ p ] ) continue;\r
+               NameToID[ IdToName[ p ] ] = parseFloat( p );\r
        };\r
-})( X.UI.Event.IdToName, X.UI.Event.NameToID );\r
+})( XUI_Event.IdToName, XUI_Event.NameToID );\r
 \r