Fixed issue #6

akiran · Feb 11, 2015 · 837466b · 837466b
1 parent b6120fa
commit 837466b
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 34 deletions.
diff --git a/dist/react-slick.js b/dist/react-slick.js
@@ -7585,6 +7585,12 @@ var Slider =
 	  },
 	  swipeStart: function (e) {
 	    var touches, posX, posY;
+
+	    if ((this.props.swipe === false) || ('ontouchend' in document && this.props.swipe === false)) {
+	      return;
+	    } else if (this.props.draggable === false && e.type.indexOf('mouse') !== -1) {
+	      return;
+	    }
 	    posX = (e.touches !== undefined) ? e.touches[0].pageX : e.clientX;
 	    posY = (e.touches !== undefined) ? e.touches[0].pageY : e.clientY;
 	    this.setState({
@@ -7620,25 +7626,27 @@ var Slider =
 	    e.preventDefault();
 	  },
 	  swipeEnd: function (e) {
-	    var touchObject = this.state.touchObject;
-	    var minSwipe = this.state.listWidth/this.props.touchThreshold;
-	    var swipeDirection = this.swipeDirection(touchObject);
-	    this.setState({
-	      dragging: false,
-	      touchObject: {} 
-	    }); 
-	    if (touchObject.swipeLength > minSwipe) {
-	      if (swipeDirection === 'left') {
-	        this.slideHandler(this.state.currentSlide + this.props.slidesToScroll);
-	      } else if (swipeDirection === 'right') {
-	        this.slideHandler(this.state.currentSlide - this.props.slidesToScroll);
+	    if (this.state.dragging) {
+	      var touchObject = this.state.touchObject;
+	      var minSwipe = this.state.listWidth/this.props.touchThreshold;
+	      var swipeDirection = this.swipeDirection(touchObject);
+	      this.setState({
+	        dragging: false,
+	        touchObject: {} 
+	      }); 
+	      if (touchObject.swipeLength > minSwipe) {
+	        if (swipeDirection === 'left') {
+	          this.slideHandler(this.state.currentSlide + this.props.slidesToScroll);
+	        } else if (swipeDirection === 'right') {
+	          this.slideHandler(this.state.currentSlide - this.props.slidesToScroll);
+	        } else {
+	          this.slideHandler(this.state.currentSlide, null, true);
+	        }
 	      } else {
 	        this.slideHandler(this.state.currentSlide, null, true);
 	      }
-	    } else {
-	      this.slideHandler(this.state.currentSlide, null, true);
+	      e.preventDefault();
 	    }
-	    e.preventDefault();
 	  },
 	};
 

diff --git a/dist/react-slick.min.js b/dist/react-slick.min.js
diff --git a/docs/demos.jsx b/docs/demos.jsx
@@ -8,7 +8,7 @@ var SingleItem = React.createClass({
       infinite: true,
       speed: 500,
       slidesToShow: 1,
-      slidesToScroll: 1
+      slidesToScroll: 1,
     };
     return (
       <div>

diff --git a/gulpfile.js b/gulpfile.js
@@ -91,4 +91,6 @@ gulp.task('dist-min', function (cb) {
   });
 });
 
-gulp.task('dist', runSequence('dist-clean', 'dist-unmin', 'dist-min'));
+gulp.task('dist', function (cb) {
+  runSequence('dist-clean', 'dist-unmin', 'dist-min', cb)
+});
diff --git a/lib/mixins/event-handlers.js b/lib/mixins/event-handlers.js
@@ -36,6 +36,12 @@ var EventHandlers = {
   },
   swipeStart: function (e) {
     var touches, posX, posY;
+
+    if ((this.props.swipe === false) || ('ontouchend' in document && this.props.swipe === false)) {
+      return;
+    } else if (this.props.draggable === false && e.type.indexOf('mouse') !== -1) {
+      return;
+    }
     posX = (e.touches !== undefined) ? e.touches[0].pageX : e.clientX;
     posY = (e.touches !== undefined) ? e.touches[0].pageY : e.clientY;
     this.setState({
@@ -71,25 +77,27 @@ var EventHandlers = {
     e.preventDefault();
   },
   swipeEnd: function (e) {
-    var touchObject = this.state.touchObject;
-    var minSwipe = this.state.listWidth/this.props.touchThreshold;
-    var swipeDirection = this.swipeDirection(touchObject);
-    this.setState({
-      dragging: false,
-      touchObject: {} 
-    }); 
-    if (touchObject.swipeLength > minSwipe) {
-      if (swipeDirection === 'left') {
-        this.slideHandler(this.state.currentSlide + this.props.slidesToScroll);
-      } else if (swipeDirection === 'right') {
-        this.slideHandler(this.state.currentSlide - this.props.slidesToScroll);
+    if (this.state.dragging) {
+      var touchObject = this.state.touchObject;
+      var minSwipe = this.state.listWidth/this.props.touchThreshold;
+      var swipeDirection = this.swipeDirection(touchObject);
+      this.setState({
+        dragging: false,
+        touchObject: {} 
+      }); 
+      if (touchObject.swipeLength > minSwipe) {
+        if (swipeDirection === 'left') {
+          this.slideHandler(this.state.currentSlide + this.props.slidesToScroll);
+        } else if (swipeDirection === 'right') {
+          this.slideHandler(this.state.currentSlide - this.props.slidesToScroll);
+        } else {
+          this.slideHandler(this.state.currentSlide, null, true);
+        }
       } else {
         this.slideHandler(this.state.currentSlide, null, true);
       }
-    } else {
-      this.slideHandler(this.state.currentSlide, null, true);
+      e.preventDefault();
     }
-    e.preventDefault();
   },
 };