From: patrickhlauke <redux@splintered.co.uk>
Date: Mon, 15 Oct 2018 19:53:51 +0000 (+0100)
Subject: Use correct touch-action values
X-Git-Tag: v4.2.0~234
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b8f01d839aa2d2683bd5f90f79fe632d58bf9a4;p=thirdparty%2Fbootstrap.git

Use correct touch-action values

- my fault, my original advice of using `touch-action: pan-x` is exactly the value we *don't* want to have the browser handle...
---

diff --git a/js/tests/unit/carousel.js b/js/tests/unit/carousel.js
index 68c28aec5e..932b90f7dd 100644
--- a/js/tests/unit/carousel.js
+++ b/js/tests/unit/carousel.js
@@ -19,7 +19,7 @@ $(function () {
 
   var stylesCarousel = [
     '<style>',
-    '  .carousel.pointer-event { -ms-touch-action: pan-x; touch-action: pan-x; }',
+    '  .carousel.pointer-event { -ms-touch-action: pan-y pinch-zoom; touch-action: pan-y pinch-zoom; }',
     '</style>'
   ].join('')
 
diff --git a/scss/_carousel.scss b/scss/_carousel.scss
index 7d3728b40d..130965f798 100644
--- a/scss/_carousel.scss
+++ b/scss/_carousel.scss
@@ -13,7 +13,7 @@
 }
 
 .carousel.pointer-event {
-  touch-action: pan-x;
+  touch-action: pan-y pinch-zoom;
 }
 
 .carousel-inner {