Taphold: fix new option to supress tap per comments on pr #5980

jquery-archive · May 9, 2013 · 57e857f · 57e857f
1 parent fd2be73
commit 57e857f
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/js/events/touch.js b/js/events/touch.js
@@ -110,7 +110,7 @@ define( [ "jquery", "../jquery.mobile.vmouse", "../jquery.mobile.support.touch"
 
 					// ONLY trigger a 'tap' event if the start target is
 					// the same as the stop target.
-					if ( $.event.special.tap.emitTapOnTaphold && !isTaphold && origTarget === event.target ) {
+					if ( !isTaphold && origTarget === event.target ) {
 						triggerCustomEvent( thisObject, "tap", event );
 					}
 				}
@@ -120,7 +120,9 @@ define( [ "jquery", "../jquery.mobile.vmouse", "../jquery.mobile.support.touch"
 				$document.bind( "vmousecancel", clearTapHandlers );
 
 				timer = setTimeout( function() {
-					isTaphold = true;
+					if( $.event.special.tap.emitTapOnTaphold ) {
+						isTaphold = true;
+					} 
 					triggerCustomEvent( thisObject, "taphold", $.Event( "taphold", { target: origTarget } ) );
 				}, $.event.special.tap.tapholdThreshold );
 			});