X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=0.6.x%2Fjs%2F20_ui%2F05_XUI_Gesture.js;h=c182e6a6323370d49cee44781772a201142c0739;hb=bafa8683f87b2f909d1301fca80684bf9ff221ed;hp=db684c3481c9976198a2ae037a5842e747584d99;hpb=6b28a86cc49680dac50278ff5617bfe7a3d98613;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 db684c3..c182e6a 100644
--- a/0.6.x/js/20_ui/05_XUI_Gesture.js
+++ b/0.6.x/js/20_ui/05_XUI_Gesture.js
@@ -259,7 +259,7 @@ function XUI_Gesture_handleEvent( e ){
 			isMouse    = e.pointerType === 'mouse',
 			touches    = [], 
 			numTouches = 0,// count the total touches on the screen
-			i, p, l, j, captured, ret, activated, gesture, startEv,
+			i, p, l, j, captured, hammerEvent, ret, activated, gesture, startEv,
 			deltaTime, deltaX, deltaY, velocity, center, startCenter;
 
 		if( !isStart && !hammer.gestureStartEvent ) return;
@@ -303,7 +303,7 @@ function XUI_Gesture_handleEvent( e ){
 			hammerEvent.touches = touches;
 
 			if( isStart && !hammer.gestureStartEvent ){
-				console.log( '=- add -=' );
+				//console.log( '=- add -=' );
 				// already busy with a Hammer.gesture detection on an element
 				hammer.gestureStartEvent = hammerEvent;
 				XUI_rootData[ 'listen' ]( [ XUI_Event._POINTER_MOVE, XUI_Event._POINTER_UP, XUI_Event._POINTER_CANCEL, XUI_Event.POINTER_OUT ], hammer, XUI_Gesture_handleEvent );				
@@ -357,13 +357,13 @@ function XUI_Gesture_handleEvent( e ){
 			// store as previous event event
 			hammer.gestureLastEvent = hammerEvent;
 			activated = hammer.gestureActivated;
-			console.log( '... ' );
+			//console.log( '... ' );
 			// call Hammer.gesture handlers
 			for( i = 0, l = gestures.length; i < l; ++i ){
 				gesture = gestures[ i ];
 
 				if( activated[ gesture.name ] && !hammer.gestureCanceled[ gesture.name ] ){
-					( console.log( '... ' + i + ' ' + gesture.name ) );
+					//( console.log( '... ' + i + ' ' + gesture.name ) );
 					// if a handler returns false, we stop with the detection
 					( ret |= ( gesture.handler( hammerEvent, hammer ) || X_CALLBACK_NONE ) );
 				};
@@ -389,14 +389,14 @@ function XUI_Gesture_handleEvent( e ){
 			for( i = touches.length; i; ){
 				uid = touches[ --i ][ 'pointerId' ];
 				if( XUI_Gesture_CAPTURED[ uid ] === hammer ){
-					console.log( 'released. ' + uid );
+					//console.log( 'released. ' + uid );
 					delete XUI_Gesture_CAPTURED[ uid ];
 				};
 			};
 		};
 
 		if( isEnd ){
-			console.log( '=- clear -=' );
+			//console.log( '=- clear -=' );
 			XUI_rootData[ 'unlisten' ]( [ XUI_Event._POINTER_MOVE, XUI_Event._POINTER_UP, XUI_Event._POINTER_CANCEL, XUI_Event.POINTER_OUT ], hammer, XUI_Gesture_handleEvent );
 			
 			hammer.previous = {
@@ -423,7 +423,7 @@ function XUI_Gesture_handleEvent( e ){
 
 
 var XUI_Gesture_LIST = [
-	/**
+	/*
 	 * Touch
 	 * Called as first, tells the user has touched the screen
 	 * @events  touch
@@ -453,7 +453,7 @@ var XUI_Gesture_LIST = [
 		}
 	},
 	
-	/**
+	/*
 	 * Transform
 	 * User want to scale or rotate with 2 fingers
 	 * @events  transform, transformstart, transformend, pinch, pinchin, pinchout, rotate
@@ -545,7 +545,7 @@ var XUI_Gesture_LIST = [
 		}
 	},
 	
-	/**
+	/*
 	 * Drag
 	 * Move with x fingers (default 1) around on the page. Blocking the scrolling when
 	 * moving left and right is a good practice. When all the drag events are blocking
@@ -624,7 +624,7 @@ var XUI_Gesture_LIST = [
 						//	break;
 						//};
 						ret |= X_CALLBACK_CAPTURE_POINTER;
-						console.log( '----- drag start ....' + e.type );
+						//console.log( '----- drag start ....' + e.type );
 						hammer.gestureTriggered[ drag.name ] = true;
 						break;
 					};
@@ -653,13 +653,13 @@ var XUI_Gesture_LIST = [
 					break;
 
 				case XUI_Event.POINTER_OUT :
-					console.log( 'cancel!!' );
+					//console.log( 'cancel!!' );
 				case XUI_Event._POINTER_CANCEL :
 				case XUI_Event._POINTER_UP:
 					// trigger dragend
 					if( hammer.gestureTriggered[ drag.name ] ){
 						ret = XUI_Gesture_trigger( hammer, XUI_Event.DRAG_END, e ) | X_CALLBACK_CAPTURE_POINTER;
-						console.log( '----- drag end ....' + e.type );
+						//console.log( '----- drag end ....' + e.type );
 						hammer.gestureTriggered[ drag.name ] = false;
 					};
 					break;
@@ -668,7 +668,7 @@ var XUI_Gesture_LIST = [
 		}
 	},
 
-	/**
+	/*
 	 * Tap/DoubleTap
 	 * Quick touch at a place or double at the same place
 	 * @events  tap, doubletap
@@ -704,7 +704,7 @@ var XUI_Gesture_LIST = [
 				// do a single tap
 				if( hammer.gestureOptions.tap_always ){
 					hammer.gestureCurrentName = 'tap';
-					console.log( 'tap! ' + e.deltaTime + 'ms ' + e.type );
+					//console.log( 'tap! ' + e.deltaTime + 'ms ' + e.type );
 					return XUI_Gesture_trigger( hammer, XUI_Event.TAP, e );
 				};
 			};