diff options
Diffstat (limited to 'src/ngTouch')
| -rw-r--r-- | src/ngTouch/directive/ngSwipe.js | 8 | ||||
| -rw-r--r-- | src/ngTouch/swipe.js | 11 | 
2 files changed, 9 insertions, 10 deletions
| diff --git a/src/ngTouch/directive/ngSwipe.js b/src/ngTouch/directive/ngSwipe.js index a5911f9a..7a468374 100644 --- a/src/ngTouch/directive/ngSwipe.js +++ b/src/ngTouch/directive/ngSwipe.js @@ -92,18 +92,18 @@ function makeSwipeDirective(directiveName, direction, eventName) {        }        $swipe.bind(element, { -        'start': function(coords) { +        'start': function(coords, event) {            startCoords = coords;            valid = true;          }, -        'cancel': function() { +        'cancel': function(event) {            valid = false;          }, -        'end': function(coords) { +        'end': function(coords, event) {            if (validSwipe(coords)) {              scope.$apply(function() {                element.triggerHandler(eventName); -              swipeHandler(scope); +              swipeHandler(scope, {$event: event});              });            }          } diff --git a/src/ngTouch/swipe.js b/src/ngTouch/swipe.js index 0ee4218e..4ad58121 100644 --- a/src/ngTouch/swipe.js +++ b/src/ngTouch/swipe.js @@ -83,12 +83,12 @@ ngTouch.factory('$swipe', [function() {          totalX = 0;          totalY = 0;          lastPos = startCoords; -        eventHandlers['start'] && eventHandlers['start'](startCoords); +        eventHandlers['start'] && eventHandlers['start'](startCoords, event);        });        element.on('touchcancel', function(event) {          active = false; -        eventHandlers['cancel'] && eventHandlers['cancel'](); +        eventHandlers['cancel'] && eventHandlers['cancel'](event);        });        element.on('touchmove mousemove', function(event) { @@ -116,20 +116,19 @@ ngTouch.factory('$swipe', [function() {          if (totalY > totalX) {            // Allow native scrolling to take over.            active = false; -          eventHandlers['cancel'] && eventHandlers['cancel'](); +          eventHandlers['cancel'] && eventHandlers['cancel'](event);            return;          } else {            // Prevent the browser from scrolling.            event.preventDefault(); - -          eventHandlers['move'] && eventHandlers['move'](coords); +          eventHandlers['move'] && eventHandlers['move'](coords, event);          }        });        element.on('touchend mouseup', function(event) {          if (!active) return;          active = false; -        eventHandlers['end'] && eventHandlers['end'](getCoordinates(event)); +        eventHandlers['end'] && eventHandlers['end'](getCoordinates(event), event);        });      }    }; | 
