X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=0.6.x%2Fjs%2F20_ui%2F05_XUI_Gesture.js;h=ed6bfecc68f2da33a736d2dd16ebfc627b979cfe;hb=3d352d8bf476ab57cc333e8d02d0e6ea5efa69b7;hp=37d0af22b8c77816f4cf4bacca6abd504b464bab;hpb=7973f3ff61f1ef5bd9732f527b175010d0c0971b;p=pettanr%2FclientJs.git diff --git a/0.6.x/js/20_ui/05_XUI_Gesture.js b/0.6.x/js/20_ui/05_XUI_Gesture.js index 37d0af2..ed6bfec 100644 --- a/0.6.x/js/20_ui/05_XUI_Gesture.js +++ b/0.6.x/js/20_ui/05_XUI_Gesture.js @@ -57,7 +57,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_PREVENT_DEFAULT; + return X_CALLBACK_STOP_NOW | X_CALLBACK_PREVENT_DEFAULT; } else // mousebutton must be down or a touch event if( type & TOUCH || //sourceEventType.match(/touch/) || // touch events are always on screen @@ -193,7 +193,7 @@ // only when the instance options have enabled this gesture active[ gesture.name ] && // if a handler returns false, we stop with the detection - ( ret |= ( gesture.handler( e, hammer ) || X_Callback_NONE ) ); + ( ret |= ( gesture.handler( e, hammer ) || X_CALLBACK_NONE ) ); }; // endevent, but not the last touch, so dont stop