QuoJS: Release 2.0.1

src/lib/quo.debug.js

@@ -1091,16 +1091,16 @@
 
 
 (function() {
+
   (function($$) {
-    var TIMEOUT_HOLD = TIMEOUT_DBLTAP = void(0);
-    var gesture_data = events = {};
-    var touches = touches2 = [];
-    (["doubleTap", "hold",
-      "swipe", "swiping", "swipeLeft", "swipeRight", "swipeUp", "swipeDown",
-      "rotate", "rotating", "rotateLeft", "rotateRight",
-      "pinch", "pinching", "pinchIn", "pinchOut",
-      "drag"
-    ]).forEach(function(event) {
+    var CURRENT_TOUCH, FIRST_TOUCH, GESTURE, GESTURES, HOLD_DELAY, TOUCH_TIMEOUT, _angle, _capturePinch, _captureRotation, _cleanGesture, _distance, _fingersPosition, _getTouches, _hold, _isSwipe, _listenTouches, _onTouchEnd, _onTouchMove, _onTouchStart, _parentIfText, _swipeDirection, _trigger;
+    GESTURE = {};
+    FIRST_TOUCH = [];
+    CURRENT_TOUCH = [];
+    TOUCH_TIMEOUT = void 0;
+    HOLD_DELAY = 650;
+    GESTURES = ["doubleTap", "hold", "swipe", "swiping", "swipeLeft", "swipeRight", "swipeUp", "swipeDown", "rotate", "rotating", "rotateLeft", "rotateRight", "pinch", "pinching", "pinchIn", "pinchOut", "drag", "dragLeft", "dragRight", "dragUp", "dragDown"];
+    GESTURES.forEach(function(event) {
       $$.fn[event] = function(callback) {
         return this.on(event, callback);
       };
@@ -1114,143 +1114,215 @@
       environment.bind("touchstart", _onTouchStart);
       environment.bind("touchmove", _onTouchMove);
       environment.bind("touchend", _onTouchEnd);
-      environment.bind("touchcancel", _cleanGesture);
+      return environment.bind("touchcancel", _cleanGesture);
     };
     _onTouchStart = function(event) {
-      var touch_data, fingers, t;
-      touch_data = _captureTouch(event);
-      fingers = touch_data.length;
-      if(touches.length > 0 && fingers === 1) {
-        _trigger('doubleTap');
-        _cleanGesture();
-      }
-      if(fingers === 1) TIMEOUT_HOLD = setTimeout(_hold, 650);
-      for(var i=0; i<fingers; i++) {
-        touches.push({
-          x:touch_data[i].pageX,
-          y:touch_data[i].pageY
-        });
-      }
-      gesture_data = {
-        element: $$(_parentIfText(touch_data[0].target)),
-        fingers: fingers
-      };
-      if(fingers === 2) {
-        gesture_data.start_angle = _angle(touches);
-        gesture_data.last_angle = 0;
-        gesture_data.start_distance = _distance(touches);
+      var delta, fingers, now, touches;
+      now = Date.now();
+      delta = now - (GESTURE.last || now);
+      TOUCH_TIMEOUT && clearTimeout(TOUCH_TIMEOUT);
+      touches = _getTouches(event);
+      fingers = touches.length;
+      FIRST_TOUCH = _fingersPosition(touches, fingers);
+      GESTURE.el = $$(_parentIfText(touches[0].target));
+      GESTURE.fingers = fingers;
+      GESTURE.last = now;
+      if (fingers === 1) {
+        GESTURE.isDoubleTap = delta > 0 && delta <= 250;
+        return setTimeout(_hold, HOLD_DELAY);
+      } else if (fingers === 2) {
+        GESTURE.initial_angle = parseInt(_angle(FIRST_TOUCH), 10);
+        GESTURE.initial_distance = parseInt(_distance(FIRST_TOUCH), 10);
+        GESTURE.angle_difference = 0;
+        return GESTURE.distance_difference = 0;
       }
     };
     _onTouchMove = function(event) {
-      var touch_data, fingers, t;
-      clearTimeout(TIMEOUT_HOLD);
-      clearTimeout(TIMEOUT_DBLTAP);
-      touches2 = [];
-      touch_data = _captureTouch(event);
-      fingers = touch_data.length;
-      if(fingers === gesture_data.fingers) {
-        for(var i=0; i<fingers; i++) {
-          touches2.push({
-            x:touch_data[i].pageX,
-            y:touch_data[i].pageY
-          });
-        }
-        if(fingers === 1) _captureSwipe();
-        else {
-          _captureRotation();
-          _capturePinch();
+      var fingers, touches;
+      if (GESTURE.el) {
+        touches = _getTouches(event);
+        fingers = touches.length;
+        if (fingers === GESTURE.fingers) {
+          CURRENT_TOUCH = _fingersPosition(touches, fingers);
+          if (_isSwipe(event)) {
+            _trigger("swiping");
+          }
+          if (fingers === 2) {
+            _captureRotation();
+            _capturePinch();
+            event.preventDefault();
+          }
+        } else {
+          _cleanGesture();
         }
       }
+      return true;
+    };
+    _isSwipe = function(event) {
+      var move_horizontal, move_vertical, ret;
+      ret = false;
+      if (CURRENT_TOUCH[0]) {
+        move_horizontal = Math.abs(FIRST_TOUCH[0].x - CURRENT_TOUCH[0].x) > 30;
+        move_vertical = Math.abs(FIRST_TOUCH[0].y - CURRENT_TOUCH[0].y) > 30;
+        ret = GESTURE.el && (move_horizontal || move_vertical);
+      }
+      return ret;
     };
     _onTouchEnd = function(event) {
-        event.preventDefault();
-      clearTimeout(TIMEOUT_HOLD);
-      var tap_triggered = false;
-      if(gesture_data.fingers === 1) {
-        if(events.swipeX) _trigger("swipe" + events.swipeX);
-        if(events.swipeY) _trigger("swipe" + events.swipeY);
-        if(events.swipeX || events.swipeY) _trigger("swipe");
-        else {
+      var anyevent, drag_direction, pinch_direction, rotation_direction, swipe_direction;
+      event.preventDefault();
+      if (GESTURE.isDoubleTap) {
+        _trigger("doubleTap");
+        return _cleanGesture();
+      } else if (GESTURE.fingers === 1) {
+        if (_isSwipe()) {
+          _trigger("swipe");
+          swipe_direction = _swipeDirection(FIRST_TOUCH[0].x, CURRENT_TOUCH[0].x, FIRST_TOUCH[0].y, CURRENT_TOUCH[0].y);
+          _trigger("swipe" + swipe_direction);
+          return _cleanGesture();
+        } else {
           _trigger("tap");
-          tap_triggered = true;
+          return TOUCH_TIMEOUT = setTimeout(_cleanGesture, 250);
         }
-      } else {
-        if(events.pinch) {
-          _trigger("pinch");
-          _trigger("pinch" + events.pinch);
+      } else if (GESTURE.fingers === 2) {
+        anyevent = false;
+        if (GESTURE.angle_difference !== 0) {
+          _trigger("rotate", {
+            angle: GESTURE.angle_difference
+          });
+          rotation_direction = GESTURE.angle_difference > 0 ? "rotateRight" : "rotateLeft";
+          _trigger(rotation_direction, {
+            angle: GESTURE.angle_difference
+          });
+          anyevent = true;
+        }
+        if (GESTURE.distance_difference !== 0) {
+          _trigger("pinch", {
+            angle: GESTURE.distance_difference
+          });
+          pinch_direction = GESTURE.distance_difference > 0 ? "pinchOut" : "pinchIn";
+          _trigger(pinch_direction, {
+            distance: GESTURE.distance_difference
+          });
+          anyevent = true;
         }
-        if(events.rotate) {
-          _trigger("rotate", {angle: gesture_data.last_angle});
-          _trigger("rotate" + events.rotate, {angle: gesture_data.last_angle});
+        if (!anyevent && CURRENT_TOUCH[0]) {
+          if (Math.abs(FIRST_TOUCH[0].x - CURRENT_TOUCH[0].x) > 10 || Math.abs(FIRST_TOUCH[0].y - CURRENT_TOUCH[0].y) > 10) {
+            _trigger("drag");
+            drag_direction = _swipeDirection(FIRST_TOUCH[0].x, CURRENT_TOUCH[0].x, FIRST_TOUCH[0].y, CURRENT_TOUCH[0].y);
+            _trigger("drag" + drag_direction);
+          }
         }
+        return _cleanGesture();
+      }
+    };
+    _fingersPosition = function(touches, fingers) {
+      var i, result;
+      result = [];
+      i = 0;
+      while (i < fingers) {
+        result.push({
+          x: touches[i].pageX,
+          y: touches[i].pageY
+        });
+        i++;
       }
-      if(tap_triggered) TIMEOUT_DBLTAP = setTimeout(_cleanGesture, 300);
-      else _cleanGesture();
+      return result;
     };
     _captureRotation = function() {
-      var angle = _angle(touches2);
-      var diff = gesture_data.start_angle - angle;
-      if( Math.abs(diff) > 5 || gesture_data.last_angle != 0 ) {
-        if(diff != gesture_data.last_angle) {
-          var symbol = gesture_data.last_angle < 0 ? '-' : '+';
-          var i=0;
-          while(Math.abs(diff - gesture_data.last_angle) > 90 && i++<10) {
-            eval("diff "+symbol+"= 180;");
-          }
-          gesture_data.last_angle = diff;
-          events.rotate = diff>0 ? "Left" : "Right";
-          _trigger('rotating', {angle: gesture_data.last_angle});
+      var angle, diff, i, symbol;
+      angle = parseInt(_angle(CURRENT_TOUCH), 10);
+      diff = parseInt(GESTURE.initial_angle - angle, 10);
+      if (Math.abs(diff) > 20 || GESTURE.angle_difference !== 0) {
+        i = 0;
+        symbol = GESTURE.angle_difference < 0 ? "-" : "+";
+        while (Math.abs(diff - GESTURE.angle_difference) > 90 && i++ < 10) {
+          eval("diff " + symbol + "= 180;");
         }
+        GESTURE.angle_difference = parseInt(diff, 10);
+        return _trigger("rotating", {
+          angle: GESTURE.angle_difference
+        });
       }
     };
     _capturePinch = function() {
-      var distance = _distance(touches2);
-      var diff = gesture_data.start_distance - distance;
-      events.pinch = false;
-      if(Math.abs(diff) > 5) {
-        _trigger('pinching', {distance: diff});
-        events.pinch = diff<0 ? 'In' : 'Out';
+      var diff, distance;
+      distance = parseInt(_distance(CURRENT_TOUCH), 10);
+      diff = GESTURE.initial_distance - distance;
+      if (Math.abs(diff) > 10) {
+        GESTURE.distance_difference = diff;
+        return _trigger("pinching", {
+          distance: diff
+        });
+      }
+    };
+    _trigger = function(type, params) {
+      if (GESTURE.el) {
+        params = params || {};
+        return GESTURE.el.trigger(type, params);
       }
     };
-    _captureSwipe = function() {
-      var xdiff = parseInt(touches2[0].x - touches[0].x, 10);
-      var ydiff = parseInt(touches2[0].y - touches[0].y, 10);
-      events.swipeX = Math.abs(xdiff) > 20 ? (xdiff>0 ? 'Right' : 'Left') : false;
-      events.swipeY = Math.abs(ydiff) > 20 ? (ydiff>0 ? 'Down' : 'Up') : false;
-      if(events.swipeX || events.swipeY) _trigger("swiping");
+    _cleanGesture = function(event) {
+      FIRST_TOUCH = [];
+      CURRENT_TOUCH = [];
+      GESTURE = {};
+      return clearTimeout(TOUCH_TIMEOUT);
     };
     _angle = function(touches_data) {
-      var A = touches_data[0], B = touches_data[1];
-      var curr_angle = Math.atan((B.y-A.y)*-1/(B.x-A.x)) * (180/Math.PI);
-      return parseInt((curr_angle<0 ? curr_angle+180 : curr_angle), 10);
+      var A, B, angle;
+      A = touches_data[0];
+      B = touches_data[1];
+      angle = Math.atan((B.y - A.y) * -1 / (B.x - A.x)) * (180 / Math.PI);
+      if (angle < 0) {
+        return angle + 180;
+      } else {
+        return angle;
+      }
     };
     _distance = function(touches_data) {
-      var A = touches_data[0], B = touches_data[1];
-      return parseInt(Math.sqrt((B.x-A.x)*(B.x-A.x)+(B.y-A.y)*(B.y-A.y)), 10)*-1;
-    };
-    _hold = function() {
-      _trigger('hold');
-      _cleanGesture();
+      var A, B;
+      A = touches_data[0];
+      B = touches_data[1];
+      return Math.sqrt((B.x - A.x) * (B.x - A.x) + (B.y - A.y) * (B.y - A.y)) * -1;
+    };
+    _getTouches = function(event) {
+      if ($$.isMobile()) {
+        return event.touches;
+      } else {
+        return [event];
+      }
     };
     _parentIfText = function(node) {
-      if ("tagName" in node) return node;
-      else return node.parentNode;
-    };
-    _captureTouch = function(event) {
-      return ($$.isMobile() ? event.touches : [event]);
+      if ("tagName" in node) {
+        return node;
+      } else {
+        return node.parentNode;
+      }
     };
-    _cleanGesture = function() {
-      clearTimeout(TIMEOUT_HOLD);
-      clearTimeout(TIMEOUT_DBLTAP);
-      gesture_data = events = {};
-      touches = touches2 = [];
+    _swipeDirection = function(x1, x2, y1, y2) {
+      var xDelta, yDelta;
+      xDelta = Math.abs(x1 - x2);
+      yDelta = Math.abs(y1 - y2);
+      if (xDelta >= yDelta) {
+        if (x1 - x2 > 0) {
+          return "Left";
+        } else {
+          return "Right";
+        }
+      } else {
+        if (y1 - y2 > 0) {
+          return "Up";
+        } else {
+          return "Down";
+        }
+      }
     };
-    _trigger = function(type, params) {
-      params = params || {};
-      params.touches = [];
-      params.touches.push(touches);
-      params.touches.push(touches2);
-      gesture_data.element.trigger(type, params);
+    _hold = function() {
+      if (GESTURE.last && (Date.now() - GESTURE.last >= HOLD_DELAY)) {
+        _trigger("hold");
+        return _cleanGesture();
+      }
     };
   })(Quo);
+
 }).call(this);