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

DO NOT MERGE - Testing PR #11493 #11498

Closed
wants to merge 2 commits into from
Closed

DO NOT MERGE - Testing PR #11493 #11498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a87394
fix(ntTouch): make tests pass on Chrome with touch enabled
gkalpak Apr 2, 2015
7a05d9a
DO NOT MERGE - Testing PR #11493
gkalpak Apr 2, 2015
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: 3 additions & 5 deletions src/ngScenario/browserTrigger.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,17 +134,15 @@
}

function createTouchEvent(element, eventType, x, y) {
var evnt = document.createEvent('TouchEvent');
var evnt = new Event(eventType);
x = x || 0;
y = y || 0;

var touch = document.createTouch(window, element, Date.now(), x, y, x, y);
var touches = document.createTouchList(touch);
var targetTouches = document.createTouchList(touch);
var changedTouches = document.createTouchList(touch);

evnt.initTouchEvent(eventType, true, true, window, null, 0, 0, 0, 0, false, false, false, false,
touches, targetTouches, changedTouches, 1, 0);
evnt.touches = touches;

return evnt;
}
}());
15 changes: 5 additions & 10 deletions src/ngTouch/directive/ngClick.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,10 +221,8 @@ ngTouch.directive('ngClick', ['$parse', '$timeout', '$rootElement',

startTime = Date.now();

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

// Use jQuery originalEvent
var originalEvent = event.originalEvent || event;
var touches = (originalEvent.changedTouches && originalEvent.changedTouches.length) ?
originalEvent.changedTouches :
((originalEvent.touches && originalEvent.touches.length) ? originalEvent.touches : [originalEvent]);
var e = touches[0];
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 x = e.clientX;
var y = e.clientY;
var dist = Math.sqrt(Math.pow(x - touchStartX, 2) + Math.pow(y - touchStartY, 2));
Expand Down
8 changes: 5 additions & 3 deletions src/ngTouch/swipe.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,11 @@ ngTouch.factory('$swipe', [function() {
};

function getCoordinates(event) {
var originalEvent = event.originalEvent || event;
var touches = originalEvent.touches && originalEvent.touches.length ? originalEvent.touches : [originalEvent];
var e = (originalEvent.changedTouches && originalEvent.changedTouches[0]) || touches[0];
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];

return {
x: e.clientX,
Expand Down