sproutcore 1.11.0.rc3 → 1.11.0

data/lib/frameworks/sproutcore/frameworks/foundation/gestures/pinch.js

@@ -1,119 +0,0 @@
-// ==========================================================================
-// Project:   SproutCore - JavaScript Application Framework
-// Copyright: ©2006-2011 Strobe Inc. and contributors.
-//            Portions ©2008-2011 Apple Inc. All rights reserved.
-// License:   Licensed under MIT license (see license.js)
-// ==========================================================================
-
-sc_require("system/gesture");
-
-/*
-  TODO Document this class
-*/
-
-/**
-  @class
-  @extends SC.Gesture
-*/
-SC.PinchGesture = SC.Gesture.extend(
-/** @scope SC.PinchGesture.prototype */{
-
-  /**
-    @type String
-    @default "pinch"
-    @readOnly
-  */
-  name: "pinch",
-
-  /**
-    @type Boolean
-    @default YES
-    @readOnly
-  */
-  acceptsMultitouch: YES,
-
-  /**
-    @type Number
-    @default 1
-  */
-  scale: 1,
-
-  /**
-    The default for this method is to loop through each touch one by one to see if it qualifies.
-    Here, however, we want to take the touches when there are 2, and only 2 of them. As a result
-    we can do the work here, with no need to pass them on.
-    
-    @param {Event} evt The touch event
-    @param {Array} touches All touches
-  */
-  unassignedTouchesDidChange: function(evt, touches) {
-    if (touches.length == 2) {
-      this.take(touches[0]);
-      this.take(touches[1]);
-    }
-  },
-
-  /**
-    We could probably just return YES here, since unassignedTouchesDidChange shouldn't let more
-    than 2 touches through, however, we're double checking here to make sure that we haven't
-    already captured 2 touches.
-    
-    @param {Touch} touch
-    @returns {Boolean} YES if there were none or one touches prior to this, NO otherwise
-  */
-  touchStart: function(touch) {
-    var touches = touch.touchesForResponder(this);
-    if (!touches || touches.length === 0) {
-      return YES;
-    } else if (touches.length == 1) {
-      this.start([touches[0], touch]);
-      return YES;
-    } else {
-      return NO;
-    }
-  },
-
-  /**
-    Here we're getting the distance between the 2 touches and comparing it to their starting
-    distance. It's possible we'll want to implement a more complex algorithm to make things
-    a bit smoother. Once we have the relative change, we trigger the pinch action in the view.
-    
-    @param {Event} evt
-    @param {Array} touches
-  */
-  touchesDragged: function(evt, touches) {
-    var touch = touches.firstObject(),
-        avg = touch.averagedTouchesForView(this);
-
-    if (avg.touchCount == 2) {
-      if (!this._startDistance) {
-        this._startDistance = avg.d;
-      }
-
-      this.scale = avg.d / this._startDistance;
-
-      this.change(touches, this.scale);
-    }
-  },
-
-  /**
-    Once one touch has ended we don't need to watch the other so we release all touches.
-    
-    @param {SC.Touch} touch
-  */
-  touchEnd: function(touch) {
-    this._startDistance = null;
-
-    var touches = touch.touchesForResponder(this);
-
-    this.trigger(touches, this.scale);
-    this.end(touches, this.scale);
-
-    if (touches) {
-      touches.forEach(function(touch){
-        this.release(touch);
-      }, this);
-    }
-  }
-
-});

data/lib/frameworks/sproutcore/frameworks/foundation/gestures/swipe.js

@@ -1,234 +0,0 @@
-// ==========================================================================
-// Project:   SproutCore - JavaScript Application Framework
-// Copyright: ©2006-2011 Strobe Inc. and contributors.
-//            Portions ©2008-2011 Apple Inc. All rights reserved.
-// License:   Licensed under MIT license (see license.js)
-// ==========================================================================
-
-sc_require("system/gesture");
-
-/*
-  TODO Document this class
-*/
-
-/**
-  @static
-  @type String
-  @constant
-*/
-SC.SWIPE_HORIZONTAL = "X";
-
-/**
-  @static
-  @type String
-  @constant
-*/
-SC.SWIPE_VERTICAL = "Y";
-
-/**
-  @static
-  @type String
-  @constant
-*/
-SC.SWIPE_ANY = "XY";
-
-/**
-  @static
-  @type String
-  @constant
-*/
-SC.SWIPE_LEFT = "LEFT";
-
-/**
-  @static
-  @type String
-  @constant
-*/
-SC.SWIPE_RIGHT = "RIGHT";
-
-/**
-  @static
-  @type String
-  @constant
-*/
-SC.SWIPE_UP = "UP";
-
-/**
-  @static
-  @type String
-  @constant
-*/
-SC.SWIPE_DOWN = "DOWN";
-
-/**
-  @class
-  @extends SC.Gesture
-*/
-SC.SwipeGesture = SC.Gesture.extend(
-/** @scope SC.SwipeGesture.prototype */ {
-
-  /**
-    @type String
-    @default "swipe"
-    @readOnly
-  */
-  name: "swipe",
-
-  /**
-    @type Boolean
-    @default YES
-    @readOnly
-  */
-  acceptsMultitouch: YES,
-
-  /**
-    @type String
-    @default SC.SWIPE_HORIZONTAL
-  */
-  direction: SC.SWIPE_HORIZONTAL,
-
-  /**
-    Will be populated with the current direction of the swipe once
-    one has been determined.
-    
-    @type String
-    @default null
-  */
-  currentDirection: null,
-
-  /**
-    @type Number
-    @default 5
-  */
-  startDistance: 5,
-
-  /**
-    @type Number
-    @default 40
-  */
-  swipeDistance: 40,
-  
-  /**
-    Amount of distance in the other direction to consider it a swipe
-    
-    @type Number
-    @default 0.5
-  */
-  tolerance: 0.5,
-  
-  /** @private */
-  touchIsInGesture: function(touch, status) {
-    // if we have not "flunked" the touch before, and it has moved 
-    if (!status.flunked) {
-      var d = this.get('direction'),
-          cd = this.get('currentDirection'),
-          startDistance = this.get('startDistance'),
-          deltaX = touch.pageX - touch.startX,
-          deltaY = touch.pageY - touch.startY,
-          absX = Math.abs(deltaX),
-          absY = Math.abs(deltaY);
-
-      if (Math.abs(deltaX) > startDistance || Math.abs(deltaY) > startDistance) {
-
-        if (!cd) {
-          if (d == SC.SWIPE_ANY) {
-            if      (absX > absY) cd = SC.SWIPE_HORIZONTAL;
-            else if (absY > absX) cd = SC.SWIPE_VERTICAL;
-            else                      return NO; // We can't determine a direction yet
-          } else {
-            cd = d;
-          }
-          this.set('currentDirection', cd);
-        }
-
-        var delta  = (cd == SC.SWIPE_HORIZONTAL) ? deltaX : deltaY,
-            oDelta = (cd == SC.SWIPE_HORIZONTAL) ? deltaY : deltaX;
-
-        if (Math.abs(delta) * this.get("tolerance") > Math.abs(oDelta)) {
-          return YES;
-        }
-
-      }
-    }
-    return NO;
-  },
-  
-  /** @private */
-  touchStart: function(touch) {
-    var d = this.get("currentDirection"), 
-        delta = touch["page" + d] - touch["start" + d],
-        swipeDirection;
-    
-    if (delta < 0) swipeDirection = (d === SC.SWIPE_HORIZONTAL) ? SC.SWIPE_LEFT : SC.SWIPE_UP;
-    else swipeDirection = (d === SC.SWIPE_HORIZONTAL) ? SC.SWIPE_RIGHT : SC.SWIPE_DOWN;
-    
-    this.start(touch, swipeDirection, delta);
-    return YES;
-  },
-  
-  /** @private */
-  touchesDragged: function(evt, touches) {
-    var touch = touches.firstObject();
-    var d = this.get("currentDirection"), 
-        o = (d === SC.SWIPE_HORIZONTAL ? "Y" : "X"),
-        delta = touch["page" + d] - touch["start" + d],
-        oDelta = touch["page" + o] - touch["start" + o],
-        swipeDirection;
-    
-    if (delta < 0) swipeDirection = (d === SC.SWIPE_HORIZONTAL) ? SC.SWIPE_LEFT : SC.SWIPE_UP;
-    else swipeDirection = (d === SC.SWIPE_HORIZONTAL) ? SC.SWIPE_RIGHT : SC.SWIPE_DOWN;
-    
-    if (
-      Math.abs(delta) < this.get("startDistance") ||
-      Math.abs(delta) * this.get("tolerance") < Math.abs(oDelta)
-    ) {
-      // does not qualify anymore
-      this.release(touch);
-
-      var allTouches = touch.touchesForResponder(this);
-      if (!allTouches || allTouches.length === 0) this.cancel(touch, swipeDirection, delta);
-    } else {
-      this.change(touch, swipeDirection, delta);
-    }
-  },
-  
-  /** @private */
-  touchEnd: function(touch) {
-    var d = this.get("currentDirection"), 
-        o = (d === SC.SWIPE_HORIZONTAL ? "Y" : "X"),
-        delta = touch["page" + d] - touch["start" + d],
-        oDelta = touch["page" + o] - touch["start" + o],
-        swipeDirection;
-    
-    // determine swipe direction
-    if (delta < 0) swipeDirection = (d === SC.SWIPE_HORIZONTAL) ? SC.SWIPE_LEFT : SC.SWIPE_UP;
-    else swipeDirection = (d === SC.SWIPE_HORIZONTAL) ? SC.SWIPE_RIGHT : SC.SWIPE_DOWN;
-
-    // trigger
-    if (
-      Math.abs(delta) > this.get("swipeDistance") ||
-      Math.abs(delta) * this.get("tolerance") < Math.abs(oDelta)
-    ) {
-      this.trigger(touch, swipeDirection);
-    }
-
-    this.end(touch, swipeDirection, delta);
-
-    this.set('currentDirection', null);
-
-    // and release all others
-    var touches = touch.touchesForResponder(this);
-    if (touches) {
-      touches.forEach(function(touch){
-        this.release(touch);
-      }, this);
-    }
-  },
-
-  /** @private */
-  cancel: function(){
-    sc_super();
-    this.set('currentDirection', null);
-  }
-
-});

data/lib/frameworks/sproutcore/frameworks/foundation/gestures/tap.js

@@ -1,157 +0,0 @@
-// ==========================================================================
-// Project:   SproutCore - JavaScript Application Framework
-// Copyright: ©2010 Strobe Inc. All rights reserved.
-// Author:    Peter Wagenet
-// License:   Licensed under MIT license (see license.js)
-// ==========================================================================
-
-sc_require("system/gesture");
-
-/**
-  @class
-  @extends SC.Gesture
-*/
-SC.TapGesture = SC.Gesture.extend(
-/** @scope SC.TapGesture.prototype */{
-
-  /**
-    @type String
-    @default "tap"
-    @readOnly
-  */
-  name: "tap",
-
-  /**
-    @type Boolean
-    @default NO
-    @readOnly
-  */
-  acceptsMultitouch: NO,
-
-  /** @private */
-  _tapCount: null,
-
-  /** @private */
-  _candidateTouch: null,
-
-  /** @private */
-  _eventTimer: null,
-
-  /**
-    @type Number
-    @default 20
-  */
-  tapWiggle: 10,
-
-  /**
-    @type Number
-    @default 200
-  */
-  tapDelay: 200,
-
-  /** @private */
-  touchIsInGesture: function(touch, status) {
-    return !touch.tapFlunked;
-  },
-
-  /** @private */
-  touchStart: function(touch) {
-    // We don't want events triggering during a touch, will be reset when touch is over if it's a candidate
-    if (this._eventTimer) this._eventTimer.invalidate();
-
-    // We have an activeTap but another touch has been started
-    if (this._candidateTouch && this._candidateTouch.touch.identifier !== touch.identifier) {
-      this._cancelTap(touch);
-      return NO;
-    }
-
-    // This touch is a candidate
-    this._candidateTouch = {
-      startTime: Date.now(),
-      touch: touch
-    };
-
-    this.start(touch);
-
-    return YES;
-  },
-
-  /** @private */
-  touchesDragged: function(evt, touches) {
-    var touch = touches[0];
-
-    // Somehow another touch got in
-    var tooManyTouches = (
-      touches.length > 1 ||
-      !this._candidateTouch ||
-      touch.identifier !== this._candidateTouch.touch.identifier
-    );
-
-    // Touch moved too much
-    var touchMoved = this._calculateDragDistance(touch) > this.get('tapWiggle');
-
-    if (tooManyTouches || touchMoved) this._cancelTap(touch);
-  },
-
-  /** @private */
-  touchEnd: function(touch){
-    if (this._calculateDragDistance(touch) > this.get('tapWiggle') || Date.now() - this._candidateTouch.startTime > this.get('tapDelay') ) {
-      // Touch moved too much or took too long
-      this._cancelTap(touch);
-    } else {
-      this._addTap(touch);
-    }
-  },
-
-  /** @private */
-  _addTap: function(touch){
-    var self = this;
-
-    if (this._eventTimer) this._eventTimer.invalidate();
-
-    this._tapCount = (this._tapCount || 0) + 1;
-    this._candidateTouch = null;
-    this._eventTimer = SC.Timer.schedule({
-      target: self,
-      action: function(){ this._triggerTap(touch); },
-      interval: this.get('tapDelay')
-    });
-
-    this.change(touch, this._tapCount);
-    this.trigger(touch, this._tapCount);
-
-  },
-
-  /** @private */
-  _cancelTap: function(touch){
-    // We don't set this on the touchStatus because the status is
-    // linked to an individual view/gesture and we want this to be
-    // global. If it's not a tap somewhere, it's not a tap anywhere.
-    touch.tapFlunked = YES;
-
-    this.release(touch);
-    this.cancel(touch, this._tapCount);
-
-    if (this._eventTimer) this._eventTimer.invalidate();
-    this._tapCount = null;
-    this._candidateTouch = null;
-    this._eventTimer = null;
-
-  },
-
-  /** @private */
-  _triggerTap: function(touch){
-    this.end(touch, this._tapCount);
-
-    this._tapCount = null;
-    this._candidateTouch = null;
-    this._eventTimer = null;
-  },
-
-  /** @private */
-  _calculateDragDistance: function(touch) {
-    return Math.sqrt(Math.pow(touch.pageX - touch.startX, 2) + Math.pow(touch.pageY - touch.startY, 2));
-  }
-
-});
-