Remove unnecesary events: tap/singleTap ... "touch" improved.

@soyjavi · @soyjavi · commit 4f97d2085a58 · 2014-06-12T15:30:45.000+02:00
diff --git a/source/quo.gestures.basic.coffee b/source/quo.gestures.basic.coffee
@@ -1,5 +1,5 @@
 ###
-Quo Basic Gestures: tap, hold, singleTap, doubleTap
+Quo Basic Gestures: touch, hold, doubleTap
 
 @namespace Quo.Gestures
 @class Basic
@@ -11,17 +11,16 @@ Quo Basic Gestures: tap, hold, singleTap, doubleTap
 
 Quo.Gestures.add
   name    : "basic"
-  events  : ["tap", "hold", "singleTap", "doubleTap", "touch"]
+  events  : ["touch", "hold", "doubleTap"]
 
   handler : do (base = Quo.Gestures) ->
     GAP = 15
     DELAY =
-      TAP       : 250
+      TAP       : 200
       DOUBLE_TAP: 400
       HOLD      : 400
 
     _hold_timeout = null
-    _simpletap_timeout = null
     _valid = true
     _target = null
     _start = null
@@ -38,33 +37,36 @@ Quo.Gestures.add
 
     move = (target, data) ->
       if _start isnt null
-        xDiff = data[0].x - _start.x
-        yDiff = data[0].y - _start.y
-        if xDiff > GAP or yDiff > GAP or data.length > 1
-          do cancel
+        diff = _calculateDiff _start, data[0]
+        do cancel if diff.x > GAP or diff.y > GAP or data.length > 1
 
     end = (target, data) ->
-      base.trigger(target, "touch", data[0])
       return unless _start
+
+      diff = _calculateDiff _start, data[0]
+      return cancel() if diff.x isnt 0 or diff.y isnt 0
+
+      # base.trigger target, "touch", data[0]
       clearTimeout _hold_timeout
       now = new Date()
       if (now - _start.time) < DELAY.TAP
         if (now - _last_tap) < DELAY.DOUBLE_TAP
-          clearTimeout _simpletap_timeout
-          base.trigger(target, "doubleTap", data[0])
+          base.trigger target, "doubleTap", data[0]
           _last_tap = null
         else
           _last_tap = now
-          base.trigger(target, "tap", data[0])
-          _simpletap_timeout = setTimeout ->
-            base.trigger(target, "singleTap", data[0])
-          , DELAY.DOUBLE_TAP + 5
+          # base.trigger target, "tap", data[0]
+          base.trigger target, "touch", data[0]
 
     cancel = () ->
       _start = null
       _valid = false
       clearTimeout _hold_timeout
-      clearTimeout _simpletap_timeout
+
+    _calculateDiff = (start, end) ->
+      diff =
+        x: end.x - start.x
+        y: end.y - start.y
 
     start   : start
     move    : move
