summaryrefslogtreecommitdiff
path: root/www/lib/angular-touch/angular-touch.js
diff options
context:
space:
mode:
authorPliablePixels <pliablepixels@gmail.com>2015-08-06 12:57:23 -0400
committerPliablePixels <pliablepixels@gmail.com>2015-08-06 12:57:23 -0400
commiteed8037064f0a2f66115981b5de7246a1dc48225 (patch)
treead0361927c779143e1488a406e7506c2ae8f1efa /www/lib/angular-touch/angular-touch.js
parent72c8fbff182ed48c36056945bbebe466e1de9dc8 (diff)
timeline now has a radial button for easier use
Diffstat (limited to 'www/lib/angular-touch/angular-touch.js')
-rw-r--r--www/lib/angular-touch/angular-touch.js15
1 files changed, 9 insertions, 6 deletions
diff --git a/www/lib/angular-touch/angular-touch.js b/www/lib/angular-touch/angular-touch.js
index fd416a35..69944d8d 100644
--- a/www/lib/angular-touch/angular-touch.js
+++ b/www/lib/angular-touch/angular-touch.js
@@ -1,6 +1,6 @@
/**
- * @license AngularJS v1.4.3
- * (c) 2010-2015 Google, Inc. http://angularjs.org
+ * @license AngularJS v1.3.17
+ * (c) 2010-2014 Google, Inc. http://angularjs.org
* License: MIT
*/
(function(window, angular, undefined) {'use strict';
@@ -105,8 +105,7 @@ ngTouch.factory('$swipe', [function() {
* `$swipe` will listen for `mouse` and `touch` events.
*
* The four events are `start`, `move`, `end`, and `cancel`. `start`, `move`, and `end`
- * receive as a parameter a coordinates object of the form `{ x: 150, y: 310 }` and the raw
- * `event`. `cancel` receives the raw `event` as its single parameter.
+ * receive as a parameter a coordinates object of the form `{ x: 150, y: 310 }`.
*
* `start` is called on either `mousedown` or `touchstart`. After this event, `$swipe` is
* watching for `touchmove` or `mousemove` events. These events are ignored until the total
@@ -264,7 +263,7 @@ ngTouch.directive('ngClick', ['$parse', '$timeout', '$rootElement',
// double-tapping, and then fire a click event.
//
// This delay sucks and makes mobile apps feel unresponsive.
- // So we detect touchstart, touchcancel and touchend ourselves and determine when
+ // So we detect touchstart, touchmove, touchcancel and touchend ourselves and determine when
// the user has tapped on something.
//
// What happens when the browser then generates a click event?
@@ -276,7 +275,7 @@ ngTouch.directive('ngClick', ['$parse', '$timeout', '$rootElement',
// So the sequence for a tap is:
// - global touchstart: Sets an "allowable region" at the point touched.
// - element's touchstart: Starts a touch
- // (- touchcancel ends the touch, no click follows)
+ // (- touchmove or touchcancel ends the touch, no click follows)
// - element's touchend: Determines if the tap is valid (didn't move too far away, didn't hold
// too long) and fires the user's tap handler. The touchend also calls preventGhostClick().
// - preventGhostClick() removes the allowable region the global touchstart created.
@@ -427,6 +426,10 @@ ngTouch.directive('ngClick', ['$parse', '$timeout', '$rootElement',
touchStartY = e.clientY;
});
+ element.on('touchmove', function(event) {
+ resetState();
+ });
+
element.on('touchcancel', function(event) {
resetState();
});