Merge pull request nolimits4web#2583 from danijelGombac/patch-1

Prevent apply grab cursor when swiper is locked
DavidLama · Apr 17, 2018 · 228df24 · 228df24
2 parents 6add670 + 9012c82
commit 228df24
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/components/core/grab-cursor/setGrabCursor.js b/src/components/core/grab-cursor/setGrabCursor.js
@@ -2,7 +2,7 @@ import Support from '../../../utils/support';
 
 export default function (moving) {
   const swiper = this;
-  if (Support.touch || !swiper.params.simulateTouch) return;
+  if (Support.touch || !swiper.params.simulateTouch || (swiper.params.watchOverflow && swiper.isLocked)) return;
   const el = swiper.el;
   el.style.cursor = 'move';
   el.style.cursor = moving ? '-webkit-grabbing' : '-webkit-grab';

diff --git a/src/components/core/grab-cursor/unsetGrabCursor.js b/src/components/core/grab-cursor/unsetGrabCursor.js
@@ -2,6 +2,6 @@ import Support from '../../../utils/support';
 
 export default function () {
   const swiper = this;
-  if (Support.touch) return;
+  if (Support.touch || (swiper.params.watchOverflow && swiper.isLocked)) return;
   swiper.el.style.cursor = '';
 }