adds comments to touch.js on async and logic changes

LEV7n · Jul 14, 2012 · d31d133 · d31d133
1 parent f1b0b84
commit d31d133
Showing 1 changed file with 58 additions and 45 deletions.
diff --git a/src/touch.js b/src/touch.js
@@ -41,55 +41,68 @@
   $(document).ready(function(){
     var now, delta
 
-    $(document.body).bind('touchstart', function(e){
-      now = Date.now()
-      delta = now - (touch.last || now)
-      touch.el = $(parentIfText(e.touches[0].target))
-      touchTimeout && clearTimeout(touchTimeout)
-      touch.x1 = e.touches[0].pageX
-      touch.y1 = e.touches[0].pageY
-      if (delta > 0 && delta <= 250) touch.isDoubleTap = true
-      touch.last = now
-      longTapTimeout = setTimeout(longTap, longTapDelay)
-    }).bind('touchmove', function(e){
-      cancelLongTap()
-      touch.x2 = e.touches[0].pageX
-      touch.y2 = e.touches[0].pageY
-    }).bind('touchend', function(e){
-       cancelLongTap()
-
-      // swipe
-      if ((touch.x2 && Math.abs(touch.x1 - touch.x2) > 30) ||
-                 (touch.y2 && Math.abs(touch.y1 - touch.y2) > 30)) {
-        swipeTimeout = setTimeout(function() {
-          touch.el.trigger('swipe') &&
-          touch.el.trigger('swipe' + (swipeDirection(touch.x1, touch.x2, touch.y1, touch.y2)))
-          touch = {}
-        }, 0);
-
-      // normal tap
-      } else if ('last' in touch) {
-        tapTimeout = setTimeout(function() {
-          var event = $.Event('tap');
-          event.cancelTouch = cancelAll;
-          touch.el.trigger(event)
-
-          if (touch.isDoubleTap) {
-            touch.el.trigger('doubleTap')
+    $(document.body)
+      .bind('touchstart', function(e){
+        now = Date.now()
+        delta = now - (touch.last || now)
+        touch.el = $(parentIfText(e.touches[0].target))
+        touchTimeout && clearTimeout(touchTimeout)
+        touch.x1 = e.touches[0].pageX
+        touch.y1 = e.touches[0].pageY
+        if (delta > 0 && delta <= 250) touch.isDoubleTap = true
+        touch.last = now
+        longTapTimeout = setTimeout(longTap, longTapDelay)
+      })
+      .bind('touchmove', function(e){
+        cancelLongTap()
+        touch.x2 = e.touches[0].pageX
+        touch.y2 = e.touches[0].pageY
+      })
+      .bind('touchend', function(e){
+         cancelLongTap()
+
+        // swipe
+        if ((touch.x2 && Math.abs(touch.x1 - touch.x2) > 30) ||
+                   (touch.y2 && Math.abs(touch.y1 - touch.y2) > 30)) {
+          swipeTimeout = setTimeout(function() {
+            touch.el.trigger('swipe')
+            touch.el.trigger('swipe' + (swipeDirection(touch.x1, touch.x2, touch.y1, touch.y2)))
             touch = {}
-          }
-          else {
-            touchTimeout = setTimeout(function(){
-              touchTimeout = null
-              touch.el.trigger('singleTap')
+          }, 0);
+
+        // normal tap
+        } else if ('last' in touch) {
+
+          // delay by one tick so we can cancel the 'tap' event if 'scroll' fires
+          // ('tap' fires before 'scroll')
+          tapTimeout = setTimeout(function() {
+
+            // trigger universal 'tap' with the option to cancelTouch()
+            // (cancelTouch cancels processing of single vs double taps for faster 'tap' response)
+            var event = $.Event('tap')
+            event.cancelTouch = cancelAll
+            touch.el.trigger(event)
+
+            // trigger double tap immediately
+            if (touch.isDoubleTap) {
+              touch.el.trigger('doubleTap')
               touch = {}
-            }, 250)
-          }
+            }
+
+            // trigger single tap after 250ms of inactivity
+            else {
+              touchTimeout = setTimeout(function(){
+                touchTimeout = null
+                touch.el.trigger('singleTap')
+                touch = {}
+              }, 250)
+            }
 
-        }, 0);
+          }, 0);
 
-      }
-    }).bind('touchcancel', cancelAll)
+        }
+      })
+      .bind('touchcancel', cancelAll)
 
     $(window).bind('scroll', cancelAll)
   })