Skip to content

Commit

Permalink
Add pointerExtend func to avoid webkitMovementX/Y
Browse files Browse the repository at this point in the history
Resolves #277, #278

Close #279
  • Loading branch information
taye committed Sep 8, 2015
1 parent 0b94aac commit e91fbc6
Showing 1 changed file with 13 additions and 4 deletions.
17 changes: 13 additions & 4 deletions interact.js
Expand Up @@ -551,6 +551,15 @@
return dest;
}

function pointerExtend (dest, source) {
for (var prop in source) {
if (prop !== 'webkitMovementX' && prop !== 'webkitMovementY') {
dest[prop] = source[prop];
}
}
return dest;
}

function copyCoords (dest, src) {
dest.page = dest.page || {};
dest.page.x = src.page.x;
Expand Down Expand Up @@ -1499,7 +1508,7 @@
// do these now since pointerDown isn't being called from here
this.downTimes[pointerIndex] = new Date().getTime();
this.downTargets[pointerIndex] = eventTarget;
extend(this.downPointer, pointer);
pointerExtend(this.downPointer, pointer);

copyCoords(this.prevCoords, this.curCoords);
this.pointerWasMoved = false;
Expand Down Expand Up @@ -1569,7 +1578,7 @@

this.downTimes[pointerIndex] = new Date().getTime();
this.downTargets[pointerIndex] = eventTarget;
extend(this.downPointer, pointer);
pointerExtend(this.downPointer, pointer);

this.setEventXY(this.prevCoords);
this.pointerWasMoved = false;
Expand Down Expand Up @@ -2760,9 +2769,9 @@
pointerEvent = pointer;
}
else {
extend(pointerEvent, event);
pointerExtend(pointerEvent, event);
if (event !== pointer) {
extend(pointerEvent, pointer);
pointerExtend(pointerEvent, pointer);
}

pointerEvent.preventDefault = preventOriginalDefault;
Expand Down

0 comments on commit e91fbc6

Please sign in to comment.