Skip to content
This repository has been archived by the owner on Apr 12, 2024. It is now read-only.

fix(ngTouch): add $event to ng-swipe #4321

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/ngTouch/directive/ngSwipe.js
Original file line number Diff line number Diff line change
Expand Up @@ -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});
});
}
}
Expand Down
11 changes: 5 additions & 6 deletions src/ngTouch/swipe.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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);
});
}
};
Expand Down
17 changes: 17 additions & 0 deletions test/ngTouch/directive/ngSwipeSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,23 @@ var swipeTests = function(description, restrictBrowsers, startEvent, moveEvent,
expect($rootScope.swiped).toBe(true);
}));

it('should pass event object', inject(function($rootScope, $compile) {
element = $compile('<div ng-swipe-left="event = $event"></div>')($rootScope);
$rootScope.$digest();

browserTrigger(element, startEvent, {
keys : [],
x : 100,
y : 20
});
browserTrigger(element, endEvent,{
keys: [],
x: 20,
y: 20
});
expect($rootScope.event).toBeDefined();
}));

it('should not swipe if you move too far vertically', inject(function($rootScope, $compile, $rootElement) {
element = $compile('<div ng-swipe-left="swiped = true"></div>')($rootScope);
$rootElement.append(element);
Expand Down