Merge branch 'v4-dev' into v4-dev-xmr-fix-blc

twbs · Nov 4, 2018 · 3885df2 · 3885df2
2 parents 9f9f94e + c46a0c7
commit 3885df2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/js/src/carousel.js b/js/src/carousel.js
@@ -283,14 +283,11 @@ class Carousel {
       if (this._pointerEvent && (event.originalEvent.pointerType === PointerType.TOUCH || event.originalEvent.pointerType === PointerType.PEN)) {
         this.touchStartX = event.originalEvent.clientX
       } else if (!this._pointerEvent) {
-        event.preventDefault()
         this.touchStartX = event.originalEvent.touches[0].clientX
       }
     }
 
     const move = (event) => {
-      event.preventDefault()
-
       // ensure swiping with one touch and not pinching
       if (event.originalEvent.touches && event.originalEvent.touches.length > 1) {
         this.touchDeltaX = 0

diff --git a/scss/_carousel.scss b/scss/_carousel.scss
@@ -16,7 +16,7 @@
 }
 
 .carousel.pointer-event {
-  touch-action: none;
+  touch-action: pan-y;
 }
 
 .carousel-inner {