Version 0.6.57, fixed NS of X.UI & X.Class for __proto__.

[pettanr/clientJs.git] / 0.6.x / js / ui / 05_XUI_Gesture.js

diff --git a/0.6.x/js/ui/05_XUI_Gesture.js b/0.6.x/js/ui/05_XUI_Gesture.js
index 58f8432..bf89d47 100644 (file)
--- a/0.6.x/js/ui/05_XUI_Gesture.js
+++ b/0.6.x/js/ui/05_XUI_Gesture.js
@@ -258,11 +258,11 @@
                        Detection.register( Gestures[ name ] );\r
                };\r
 \r
-               if( navigator.pointerEnabled || navigator.msPointerEnabled ){\r
+               if( X.Dom.EVENT_POINTER ){\r
                        Hammer.EVENT_TYPES_START = [ X.UI.Event._POINTER_DOWN ];\r
                        types = [ X.UI.Event._POINTER_MOVE, X.UI.Event._POINTER_UP, X.UI.Event._POINTER_CANCEL ];\r
                } else\r
-               if( window.ontouchstart !== void 0 ){\r
+               if( X.Dom.EVENT_TOUCH ){\r
                        Hammer.EVENT_TYPES_START = [ X.UI.Event._TOUCH_START ];\r
                        types = [ X.UI.Event._TOUCH_MOVE, X.UI.Event._MOUSE_MOVE, X.UI.Event._TOUCH_END, X.UI.Event._TOUCH_CANCEL ];\r
                } else {\r
@@ -281,7 +281,6 @@
                if( !this.types[ type ] ) return;\r
                var e = Utils.extend( {}, gesture );\r
                e.type = type;\r
-               console.log( 'trigger : ' + type );\r
                return this.uinode.dispatch( e );\r
        };\r
        \r
@@ -825,7 +824,7 @@
                                        return hammer.trigger( X.UI.Event.DOUBLE_TAP, e );\r
                                } else\r
                                // do a single tap\r
-                               if( hammer.options.tap_always ){\r
+                               if( hammer.options.tap_always && Detection.current.name !== 'tap' ){ // EventFire中にalert すると mouseleave で再び呼ばれるのを防ぐ\r
                                        Detection.current.name = 'tap';\r
                                        return hammer.trigger( X.UI.Event.TAP, e );\r
                                };\r