- Fixing issue with scrollOverflow extension and touch devices.

- Updating version and dist files
alvarotrigo · Mar 7, 2018 · b5cff48b7fe54094df23a63fc7ec611212feed7e · b5cff48
1 parent ef11829
commit b5cff48b7fe54094df23a63fc7ec611212feed7e
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 ![compatibility](http://alvarotrigo.com/multiScroll/imgs/compatible.gif)
 
 ---
-![multiScroll.js version](http://img.shields.io/badge/multiscroll.js-v0.2.0-brightgreen.svg)
+![multiScroll.js version](http://img.shields.io/badge/multiscroll.js-v0.2.1-brightgreen.svg)
 [![License](http://img.shields.io/badge/License-MIT-blue.svg)](http://opensource.org/licenses/MIT)
 [![PayPal Donate](https://img.shields.io/badge/donate-PayPal.me-ff69b4.svg)](https://www.paypal.me/alvarotrigo/9.95)
 &nbsp;&nbsp; **|**&nbsp;&nbsp; *3.7Kb gziped* &nbsp;&nbsp;**|**&nbsp;&nbsp; *Created by [@imac2](https://twitter.com/imac2)*

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "multiscroll.js",
-  "version": "0.1.9",
+  "version": "0.2.1",
   "homepage": "http://alvarotrigo.com/multiScroll/",
   "authors": [
     "Alvaro Trigo https://github.com/alvarotrigo"

diff --git a/dist/jquery.multiscroll.css b/dist/jquery.multiscroll.css
@@ -1,5 +1,5 @@
 /*!
- * multiscroll.js 0.2.0
+ * multiscroll.js 0.2.1
  * https://github.com/alvarotrigo/multiscroll.js
  * @license MIT licensed
  *

diff --git a/dist/jquery.multiscroll.extensions.min.js b/dist/jquery.multiscroll.extensions.min.js
diff --git a/dist/jquery.multiscroll.js b/dist/jquery.multiscroll.js
@@ -1,5 +1,5 @@
 /*!
- * multiscroll.js 0.2.0
+ * multiscroll.js 0.2.1
  * https://github.com/alvarotrigo/multiscroll.js
  * @license MIT licensed
  *
@@ -65,6 +65,11 @@
         var isMoving = false;
         var nav;
         var windowHeight = $(window).height();
+        var MSPointer = getMSPointer();
+        var events = {
+            touchmove: 'ontouchmove' in window ? 'touchmove' :  MSPointer.move,
+            touchstart: 'ontouchstart' in window ? 'touchstart' :  MSPointer.down
+        };
 
         //timeouts
         var resizeId;
@@ -812,25 +817,19 @@
         * Adds the possibility to auto scroll through sections on touch devices.
         */
         function addTouchHandler(){
-            if(isTouch){
-                //Microsoft pointers
-                MSPointer = getMSPointer();
-
-                $(document).off('touchstart ' +  MSPointer.down).on('touchstart ' + MSPointer.down, touchStartHandler);
-                $(document).off('touchmove ' + MSPointer.move).on('touchmove ' + MSPointer.move, touchMoveHandler);
+            if(isTouch || isTouchDevice){
+                $(document).off(events.touchstart).on(events.touchstart, touchStartHandler);
+                $(document).off(events.touchmove).on(events.touchmove, touchMoveHandler);
             }
         }
 
         /**
         * Removes the auto scrolling for touch devices.
         */
         function removeTouchHandler(){
-            if(isTouch){
-                //Microsoft pointers
-                MSPointer = getMSPointer();
-
-                $(document).off('touchstart ' + MSPointer.down);
-                $(document).off('touchmove ' + MSPointer.move);
+            if(isTouch || isTouchDevice){
+                $(document).off(events.touchstart);
+                $(document).off(events.touchmove);
             }
         }
 
@@ -865,7 +864,7 @@
             events.x = (typeof e.pageX !== 'undefined' && (e.pageY || e.pageX) ? e.pageX : e.touches[0].pageX);
 
             //in touch devices with scrollBar:true, e.pageY is detected, but we have to deal with touch events. #1008
-            if(isTouch && isReallyTouch(e)){
+            if(isTouch && isReallyTouch(e) && typeof e.touches !== 'undefined'){
                 events.y = e.touches[0].pageY;
                 events.x = e.touches[0].pageX;
             }

diff --git a/dist/jquery.multiscroll.min.css b/dist/jquery.multiscroll.min.css
diff --git a/dist/jquery.multiscroll.min.css.map b/dist/jquery.multiscroll.min.css.map