rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00
Code Issues Actions Packages Releases Activity

Abandon swipe altogether if more than one touch detected

Browse Source
This commit is contained in:
patrickhlauke 2018-10-15 21:54:20 +01:00 committed by XhmikosR
parent 7b8f01d839
commit 6be7293a85
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/src/carousel.js
View File

@ -283,8 +283,8 @@ class Carousel {
if (this._pointerEvent && (originEvent.pointerType === PointerType.TOUCH || originEvent.pointerType === PointerType.PEN)) { if (this._pointerEvent && (originEvent.pointerType === PointerType.TOUCH || originEvent.pointerType === PointerType.PEN)) {
this.touchStartX = originEvent.clientX this.touchStartX = originEvent.clientX
} else { } else if (!this._pointerEvent) {
this.touchStartX = originEvent.touches[0].pageX this.touchStartX = originEvent.touches[0].clientX
} }
} }
@ -293,11 +293,12 @@ class Carousel {
// ensure swiping with one touch and not pinching // ensure swiping with one touch and not pinching
if (event.originalEvent.touches && event.originalEvent.touches.length > 1) { if (event.originalEvent.touches && event.originalEvent.touches.length > 1) {
this.touchDeltaX = 0;
return return
} }
if (!this._pointerEvent) { if (!this._pointerEvent) {
this.touchDeltaX = event.originalEvent.touches[0].pageX - this.touchStartX this.touchDeltaX = event.originalEvent.touches[0].clientX - this.touchStartX
} }
} }