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

fix(ngMobile): touch event handling fix for when jQuery is present. #2773

Closed
wants to merge 1 commit into from
Closed

fix(ngMobile): touch event handling fix for when jQuery is present. #2773

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 15 additions & 2 deletions src/ngMobile/directive/ngClick.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,10 @@ ngMobile.directive('ngClick', ['$parse', '$timeout', '$rootElement',
return; // Too old.
}

if (event.originalEvent) {
event = event.originalEvent;
}

var touches = event.touches && event.touches.length ? event.touches : [event];
var x = touches[0].clientX;
var y = touches[0].clientY;
Expand All @@ -141,6 +145,9 @@ ngMobile.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) {
if (event.originalEvent) {
event = event.originalEvent;
}
var touches = event.touches && event.touches.length ? event.touches : [event];
var x = touches[0].clientX;
var y = touches[0].clientY;
Expand Down Expand Up @@ -187,6 +194,9 @@ ngMobile.directive('ngClick', ['$parse', '$timeout', '$rootElement',

element.bind('touchstart', function(event) {
tapping = true;
if (event.originalEvent) {
event = event.originalEvent;
}
tapElement = event.target ? event.target : event.srcElement; // IE uses srcElement.
// Hack for Safari, which can target text nodes instead of containers.
if(tapElement.nodeType == 3) {
Expand All @@ -198,7 +208,7 @@ ngMobile.directive('ngClick', ['$parse', '$timeout', '$rootElement',
startTime = Date.now();

var touches = event.touches && event.touches.length ? event.touches : [event];
var e = touches[0].originalEvent || touches[0];
var e = touches[0];
touchStartX = e.clientX;
touchStartY = e.clientY;
});
Expand All @@ -214,9 +224,12 @@ ngMobile.directive('ngClick', ['$parse', '$timeout', '$rootElement',
element.bind('touchend', function(event) {
var diff = Date.now() - startTime;

if (event.originalEvent) {
event = event.originalEvent;
}
var touches = (event.changedTouches && event.changedTouches.length) ? event.changedTouches :
((event.touches && event.touches.length) ? event.touches : [event]);
var e = touches[0].originalEvent || touches[0];
var e = touches[0];
var x = e.clientX;
var y = e.clientY;
var dist = Math.sqrt( Math.pow(x - touchStartX, 2) + Math.pow(y - touchStartY, 2) );
Expand Down