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

Allowing angular-touch to work with jQuery. #8584

Closed
wants to merge 2 commits 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
10 changes: 9 additions & 1 deletion src/ngTouch/directive/ngClick.js
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,8 @@ ngTouch.directive('ngClick', ['$parse', '$timeout', '$rootElement',
return; // Too old.
}

// Use JQuery originalEvent
event = event.originalEvent || event;
var touches = event.touches && event.touches.length ? event.touches : [event];
var x = touches[0].clientX;
var y = touches[0].clientY;
Expand Down Expand Up @@ -165,6 +167,8 @@ ngTouch.directive('ngClick', ['$parse', '$timeout', '$rootElement',
// Global touchstart handler that creates an allowable region for a click event.
// This allowable region can be removed by preventGhostClick if we want to bust it.
function onTouchStart(event) {
// Use JQuery originalEvent
event = event.originalEvent || event;
var touches = event.touches && event.touches.length ? event.touches : [event];
var x = touches[0].clientX;
var y = touches[0].clientY;
Expand Down Expand Up @@ -210,6 +214,8 @@ ngTouch.directive('ngClick', ['$parse', '$timeout', '$rootElement',
}

element.on('touchstart', function(event) {
// Use JQuery originalEvent
event = event.originalEvent || event;
tapping = true;
tapElement = event.target ? event.target : event.srcElement; // IE uses srcElement.
// Hack for Safari, which can target text nodes instead of containers.
Expand Down Expand Up @@ -237,7 +243,9 @@ ngTouch.directive('ngClick', ['$parse', '$timeout', '$rootElement',

element.on('touchend', function(event) {
var diff = Date.now() - startTime;


// Use JQuery originalEvent
event = event.originalEvent || event;
var touches = (event.changedTouches && event.changedTouches.length) ? event.changedTouches :
((event.touches && event.touches.length) ? event.touches : [event]);
var e = touches[0].originalEvent || touches[0];
Expand Down
7 changes: 3 additions & 4 deletions src/ngTouch/swipe.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,10 @@ ngTouch.factory('$swipe', [function() {
};

function getCoordinates(event) {
// Use JQuery originalEvent
event = event.originalEvent || event;
var touches = event.touches && event.touches.length ? event.touches : [event];
var e = (event.changedTouches && event.changedTouches[0]) ||
(event.originalEvent && event.originalEvent.changedTouches &&
event.originalEvent.changedTouches[0]) ||
touches[0].originalEvent || touches[0];
var e = (event.changedTouches && event.changedTouches[0]) || touches[0];

return {
x: e.clientX,
Expand Down