update

mdbootstrap · Jul 10, 2018 · 60e8fe7 · 60e8fe7
1 parent db326b9
commit 60e8fe7
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 22 deletions.
diff --git a/dist/perfect-scrollbar.common.js b/dist/perfect-scrollbar.common.js
@@ -954,12 +954,13 @@ var touch = function(i) {
   }
 
   function touchStart(e) {
-    if (!shouldHandle(e)) {
-      return;
-    }
     if (!i.settings.swipePropagation) {
+      console.log("---touchStart stop");
       e.stopPropagation();
     }
+    if (!shouldHandle(e)) {
+      return;
+    }
     var touch = getTouch(e);
 
     startOffset.pageX = touch.pageX;
@@ -1018,6 +1019,10 @@ var touch = function(i) {
   }
 
   function touchMove(e) {
+    if (!i.settings.swipePropagation) {
+      console.log("---touchMove stop");
+      e.stopPropagation();
+    }
     if (shouldHandle(e)) {
       var touch = getTouch(e);
 
@@ -1047,7 +1052,11 @@ var touch = function(i) {
       }
     }
   }
-  function touchEnd() {
+  function touchEnd(e) {
+    if (!i.settings.swipePropagation) {
+      console.log("---touchEnd stop");
+      e.stopPropagation();
+    }
     if (i.settings.swipeEasing) {
       clearInterval(easingLoop);
       easingLoop = setInterval(function() {

diff --git a/dist/perfect-scrollbar.esm.js b/dist/perfect-scrollbar.esm.js
@@ -952,12 +952,13 @@ var touch = function(i) {
   }
 
   function touchStart(e) {
-    if (!shouldHandle(e)) {
-      return;
-    }
     if (!i.settings.swipePropagation) {
+      console.log("---touchStart stop");
       e.stopPropagation();
     }
+    if (!shouldHandle(e)) {
+      return;
+    }
     var touch = getTouch(e);
 
     startOffset.pageX = touch.pageX;
@@ -1016,6 +1017,10 @@ var touch = function(i) {
   }
 
   function touchMove(e) {
+    if (!i.settings.swipePropagation) {
+      console.log("---touchMove stop");
+      e.stopPropagation();
+    }
     if (shouldHandle(e)) {
       var touch = getTouch(e);
 
@@ -1045,7 +1050,11 @@ var touch = function(i) {
       }
     }
   }
-  function touchEnd() {
+  function touchEnd(e) {
+    if (!i.settings.swipePropagation) {
+      console.log("---touchEnd stop");
+      e.stopPropagation();
+    }
     if (i.settings.swipeEasing) {
       clearInterval(easingLoop);
       easingLoop = setInterval(function() {

diff --git a/dist/perfect-scrollbar.js b/dist/perfect-scrollbar.js
@@ -958,12 +958,13 @@ var touch = function(i) {
   }
 
   function touchStart(e) {
-    if (!shouldHandle(e)) {
-      return;
-    }
     if (!i.settings.swipePropagation) {
+      console.log("---touchStart stop");
       e.stopPropagation();
     }
+    if (!shouldHandle(e)) {
+      return;
+    }
     var touch = getTouch(e);
 
     startOffset.pageX = touch.pageX;
@@ -1022,6 +1023,10 @@ var touch = function(i) {
   }
 
   function touchMove(e) {
+    if (!i.settings.swipePropagation) {
+      console.log("---touchMove stop");
+      e.stopPropagation();
+    }
     if (shouldHandle(e)) {
       var touch = getTouch(e);
 
@@ -1051,7 +1056,11 @@ var touch = function(i) {
       }
     }
   }
-  function touchEnd() {
+  function touchEnd(e) {
+    if (!i.settings.swipePropagation) {
+      console.log("---touchEnd stop");
+      e.stopPropagation();
+    }
     if (i.settings.swipeEasing) {
       clearInterval(easingLoop);
       easingLoop = setInterval(function() {