Version 0.6.94, new X.Callback is fast & light maybe.

[pettanr/clientJs.git] / 0.6.x / js / 02_dom / 03_XDomEvent.js

diff --git a/0.6.x/js/02_dom/03_XDomEvent.js b/0.6.x/js/02_dom/03_XDomEvent.js
index 183090e..df7c725 100644 (file)
--- a/0.6.x/js/02_dom/03_XDomEvent.js
+++ b/0.6.x/js/02_dom/03_XDomEvent.js
@@ -12,11 +12,11 @@
 \r
 // http://msdn.microsoft.com/ja-jp/library/ie/dn255104%28v=vs.85%29.aspx\r
 var X_Dom_Event_devicePixelRatio = window.devicePixelRatio || ( window.screen.deviceXDPI / window.screen.logicalXDPI ),\r
-       X_Dom_Event_convertMSPointerType = window.MSPointerEvent && {\r
-               2 : 'touch',\r
-               3 : 'pen',\r
-               4 : 'mouse'\r
-       };\r
+       X_Dom_Event_convertMSPointerType = window.MSPointerEvent && [ 0, 0, 'touch', 'pen', 'mouse' ];/*{\r
+               '2' : 'touch',\r
+               '3' : 'pen',\r
+               '4' : 'mouse'\r
+       }; */\r
 \r
 if( !X.UA.IE || 9 <= X.UA.IE ){\r
        X.Dom.Event = function( e, xnode ){\r
@@ -340,7 +340,7 @@ X.Dom.Event._LOAD_FIX_TAGS = {
 \r
 X.Dom.Event.Rename    = {};\r
 X.Dom.Event.RenameTo  = {};\r
-X.Dom.Event.toPointer = !X.Dom.EVENT_POINTER && ( X.Dom.EVENT_TOUCH ?\r
+X.Dom.Event.toPointer = !X_UA_HID.POINTER && ( X_UA_HID.TOUCH ?\r
        {\r
                touchdown   : 'pointerdown',\r
                mousedown   : 'pointerdown',\r
@@ -444,7 +444,7 @@ if( !navigator.pointerEnabled ){
                X.Dom.Event.Rename[ 'pointercancel'   ] = 'MSPointerCancel';\r
                // http://msdn.microsoft.com/ja-jp/library/ie/dn304886%28v=vs.85%29.aspx\r
        } else\r
-       if( X.Dom.EVENT_TOUCH ){\r
+       if( X_UA_HID.TOUCH ){\r
                X.Dom.Event.Rename[ 'pointerdown'     ] = [ 'touchdown', 'mousedown' ];\r
                X.Dom.Event.Rename[ 'pointerup'       ] = [ 'touchup',   'mouseup' ];\r
                X.Dom.Event.Rename[ 'pointermove'     ] = [ 'touchmove', 'mousemove' ];\r
@@ -486,7 +486,7 @@ if( !navigator.pointerEnabled ){
 // http://shimax.cocolog-nifty.com/search/2006/09/safarijavascrip_c54d.html\r
 \r
 /* for ie9+/Mozilla/Opera9 */\r
-if( X.Dom.EVENT_W3C ){\r
+if( X_UA_EVENT.W3C ){\r
        Node._document.listenOnce( 'DOMContentLoaded', X.Dom._init );\r
 } else\r
 if( 6 <= X.UA.IE && X.inHead ){\r
@@ -508,7 +508,7 @@ if( 6 <= X.UA.IE && X.inHead ){
 // http://lists.apple.com/archives/web-dev/2003/Oct/msg00036.html\r
 if( X.UA.WebKit || X.UA.Safari < 3 ){ // sniff\r
        X.Timer.add( 16, function(){\r
-               if( !X.Dom._init ) return X.Callback.UN_LISTEN;\r
+               if( !X.Dom._init ) return X_Callback_UN_LISTEN;\r
                if( document.readyState === 'loaded' || document.readyState === 'complete' ) return X.Dom._init();\r
        });\r
 };\r