From d2594ec5859dfa7a57b49da7954d4ac5038cfb68 Mon Sep 17 00:00:00 2001
From: Kin Blas <jblas@adobe.com>
Date: Wed, 9 Mar 2011 14:14:53 -0800
Subject: [PATCH] Reworked tap/taphold code so that it makes use of
 vmousecancel to detect when the user has scrolled the page. Also refactored
 some of the event handler calling code into a function. I'm still not sure
 why the handler is called directly versus using the jQuery trigger() method
 which would allow bubbling.

---
 js/jquery.mobile.event.js | 76 ++++++++++++++++-----------------------
 1 file changed, 30 insertions(+), 46 deletions(-)

diff --git a/js/jquery.mobile.event.js b/js/jquery.mobile.event.js
index 25c688ab..b49c2425 100644
--- a/js/jquery.mobile.event.js
+++ b/js/jquery.mobile.event.js
@@ -20,6 +20,14 @@ var supportTouch = $.support.touch,
 	touchStopEvent = supportTouch ? "touchend" : "mouseup",
 	touchMoveEvent = supportTouch ? "touchmove" : "mousemove";
 
+function triggerCustomEvent(obj, eventType, event)
+{
+	var originalType = event.type;
+	event.type = eventType;
+	$.event.handle.call( obj, event );
+	event.type = originalType;
+}
+
 // also handles scrollstop
 $.event.special.scrollstart = {
 	enabled: true,
@@ -32,10 +40,7 @@ $.event.special.scrollstart = {
 		
 		function trigger( event, state ) {
 			scrolling = state;
-			var originalType = event.type;
-			event.type = scrolling ? "scrollstart" : "scrollstop";
-			$.event.handle.call( thisObject, event );
-			event.type = originalType;
+			triggerCustomEvent( thisObject, scrolling ? "scrollstart" : "scrollstop", event );
 		}
 		
 		// iPhone triggers scroll after a small delay; use touchmove instead
@@ -68,57 +73,35 @@ $.event.special.tap = {
 					return false;
 				}
 				
-				var moved = false,
-					touching = true,
+				var touching = true,
 					origTarget = event.target,
 					origEvent = event.originalEvent,
-					origPos = [ event.pageX, event.pageY ],
-					originalType,
 					timer;
 					
-				
-				function moveHandler( event ) {
-					if( event.type == "scroll" ){
-						moved = true;
-						return;
-					}
-					var newPageXY = event;
-					if ((Math.abs(origPos[0] - newPageXY.pageX) > 10) ||
-					    (Math.abs(origPos[1] - newPageXY.pageY) > 10)) {
-					    moved = true;
-					}
+				function clearTapHandlers() {
+					touching = false;
+					clearTimeout(timer);
+					$(this).unbind("vmouseclick", clickHandler).unbind("vmousecancel", clearTapHandlers);
 				}
 				
+				function clickHandler(event) {
+					clearTapHandlers();
+
+					/* ONLY trigger a 'tap' event if the start target is
+					 * the same as the stop target.
+					 */
+					if ( !origTarget == event.target ) {
+						triggerCustomEvent( thisObject, "tap", event );
+					}
+				}
+
+				$this.bind("vmousecancel", clearTapHandlers).bind("vclick", clickHandler);
+
 				timer = setTimeout(function() {
-					if ( touching && !moved ) {
-						originalType = event.type;
-						event.type = "taphold";
-						$.event.handle.call( thisObject, event );
-						event.type = originalType;
+					if ( touching ) {
+						triggerCustomEvent( thisObject, "taphold", event );
 					}
 				}, 750 );
-				
-				//scroll now cancels tap
-				$(window).one("scroll", moveHandler);
-				
-				$this
-					.bind( "vmousemove", moveHandler )
-					.one( "vmouseup", function( event ) {
-						$this.unbind( "vmousemove", moveHandler );
-						$(window).unbind("scroll", moveHandler);
-						clearTimeout( timer );
-						touching = false;
-						
-						/* ONLY trigger a 'tap' event if the start target is
-						 * the same as the stop target.
-						 */
-						if ( !moved && ( origTarget == event.target ) ) {
-							originalType = event.type;
-							event.type = "tap";
-							$.event.handle.call( thisObject, event );
-							event.type = originalType;
-						}
-					});
 			});
 	}
 };
@@ -170,6 +153,7 @@ $.event.special.swipe = {
 									Math.abs( start.coords[1] - stop.coords[1]) < 75 ) {
 								start.origin
 								.trigger( "swipe" )
+
 								.trigger( start.coords[0] > stop.coords[0] ? "swipeleft" : "swiperight" );
 							}
 						}