Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpatrickhlauke <redux@splintered.co.uk>2018-10-15 23:54:20 +0300
committerXhmikosR <xhmikosr@gmail.com>2018-10-20 15:32:09 +0300
commit6be7293a85e401f9937cfb2d1bb5d4df9b35b6d2 (patch)
tree041027e2dd7e28fcb72a44ae4cd683c9ecb128d9 /js/src/carousel.js
parent7b8f01d839aa2d2683bd5f90f79fe632d58bf9a4 (diff)
Abandon swipe altogether if more than one touch detected
Diffstat (limited to 'js/src/carousel.js')
-rw-r--r--js/src/carousel.js7
1 files changed, 4 insertions, 3 deletions
diff --git a/js/src/carousel.js b/js/src/carousel.js
index f0ad83bb0b..997424bfac 100644
--- a/js/src/carousel.js
+++ b/js/src/carousel.js
@@ -283,8 +283,8 @@ class Carousel {
if (this._pointerEvent && (originEvent.pointerType === PointerType.TOUCH || originEvent.pointerType === PointerType.PEN)) {
this.touchStartX = originEvent.clientX
- } else {
- this.touchStartX = originEvent.touches[0].pageX
+ } else if (!this._pointerEvent) {
+ this.touchStartX = originEvent.touches[0].clientX
}
}
@@ -293,11 +293,12 @@ class Carousel {
// ensure swiping with one touch and not pinching
if (event.originalEvent.touches && event.originalEvent.touches.length > 1) {
+ this.touchDeltaX = 0;
return
}
if (!this._pointerEvent) {
- this.touchDeltaX = event.originalEvent.touches[0].pageX - this.touchStartX
+ this.touchDeltaX = event.originalEvent.touches[0].clientX - this.touchStartX
}
}