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

Use changedTouches instead of targetTouches in style.getClientPosition #337

Closed
fredj wants to merge 1 commit into from
Closed

Use changedTouches instead of targetTouches in style.getClientPosition #337

Show file tree
Hide file tree
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
9 changes: 4 additions & 5 deletions closure/goog/style/style.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -842,11 +842,10 @@ goog.style.getClientPosition = function(el) {
var be = /** @type {!goog.events.BrowserEvent} */ (el);
var targetEvent = el;

if (el.targetTouches && el.targetTouches.length) {
targetEvent = el.targetTouches[0];
} else if (isAbstractedEvent && be.getBrowserEvent().targetTouches &&
be.getBrowserEvent().targetTouches.length) {
targetEvent = be.getBrowserEvent().targetTouches[0];
if (el.changedTouches) {
targetEvent = el.changedTouches[0];
} else if (isAbstractedEvent && be.getBrowserEvent().changedTouches) {
targetEvent = be.getBrowserEvent().changedTouches[0];
}

return new goog.math.Coordinate(
Expand Down
14 changes: 11 additions & 3 deletions closure/goog/style/style_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,6 +414,10 @@ function testGetClientPositionEvent() {
function testGetClientPositionTouchEvent() {
var mockTouchEvent = {};

mockTouchEvent.changedTouches = [{}];
mockTouchEvent.changedTouches[0].clientX = 100;
mockTouchEvent.changedTouches[0].clientY = 200;

mockTouchEvent.targetTouches = [{}];
mockTouchEvent.targetTouches[0].clientX = 100;
mockTouchEvent.targetTouches[0].clientY = 200;
Expand All @@ -430,12 +434,13 @@ function testGetClientPositionTouchEvent() {
function testGetClientPositionEmptyTouchList() {
var mockTouchEvent = {};

mockTouchEvent.clientX = 100;
mockTouchEvent.clientY = 200;

mockTouchEvent.targetTouches = [];
mockTouchEvent.touches = [];

mockTouchEvent.changedTouches = [{}];
mockTouchEvent.changedTouches[0].clientX = 100;
mockTouchEvent.changedTouches[0].clientY = 200;

var pos = goog.style.getClientPosition(mockTouchEvent);
assertEquals(100, pos.x);
assertEquals(200, pos.y);
Expand All @@ -444,6 +449,9 @@ function testGetClientPositionEmptyTouchList() {
function testGetClientPositionAbstractedTouchEvent() {
var e = new goog.events.BrowserEvent();
e.event_ = {};
e.event_.changedTouches = [{}];
e.event_.changedTouches[0].clientX = 100;
e.event_.changedTouches[0].clientY = 200;
e.event_.touches = [{}];
e.event_.touches[0].clientX = 100;
e.event_.touches[0].clientY = 200;
Expand Down