X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;ds=sidebyside;f=0.6.x%2Fjs%2Fui%2F05_XUI_Gesture.js;fp=0.6.x%2Fjs%2Fui%2F05_XUI_Gesture.js;h=5f1b3004d2c568e3028196b7d227e1bd670597b3;hb=2621070c032954702155d4a315535b8b1aafd616;hp=bf89d47d7193e8d4db2c1b02d9cff3fc7b977a96;hpb=4e5a06c9c610f8d3777f9d2eef71ec1365ffff1b;p=pettanr%2FclientJs.git

diff --git a/0.6.x/js/ui/05_XUI_Gesture.js b/0.6.x/js/ui/05_XUI_Gesture.js
index bf89d47..5f1b300 100644
--- a/0.6.x/js/ui/05_XUI_Gesture.js
+++ b/0.6.x/js/ui/05_XUI_Gesture.js
@@ -65,7 +65,7 @@
 		// onmouseup, but when touchend has been fired we do nothing.
 		// this is for touchdevices which also fire a mouseup on touchend
 		if( type & MOUSE && touch_triggered ){
-			return X.Callback.STOP_NOW | X.Callback.STOP_PROPAGATION | X.Callback.PREVENT_DEFAULT;
+			return X.Callback.STOP_NOW | X.Callback.PREVENT_DEFAULT;
 		}
 		// mousebutton must be down or a touch event
 		else if (
@@ -263,8 +263,9 @@
 			types = [ X.UI.Event._POINTER_MOVE, X.UI.Event._POINTER_UP, X.UI.Event._POINTER_CANCEL ];
 		} else
 		if( X.Dom.EVENT_TOUCH ){
-			Hammer.EVENT_TYPES_START = [ X.UI.Event._TOUCH_START ];
-			types = [ X.UI.Event._TOUCH_MOVE, X.UI.Event._MOUSE_MOVE, X.UI.Event._TOUCH_END, X.UI.Event._TOUCH_CANCEL ];
+			Hammer.EVENT_TYPES_START = [ X.UI.Event._TOUCH_START, X.UI.Event._MOUSE_DOWN ];
+			types = [ X.UI.Event._MOUSE_MOVE, X.UI.Event._MOUSE_UP, X.UI.Event._MOUSE_CANCEL,
+				X.UI.Event._TOUCH_MOVE, X.UI.Event._TOUCH_END, X.UI.Event._TOUCH_CANCEL ];
 		} else {
 			Hammer.EVENT_TYPES_START = [ X.UI.Event._MOUSE_DOWN ];
 			types = [ X.UI.Event._MOUSE_MOVE, X.UI.Event._MOUSE_UP, X.UI.Event._MOUSE_CANCEL ];