Added fix for issue malihu#303 (malihu#303) regarding mobile Google C…

…hrome
jchicks · Jun 8, 2015 · 2cbe6a9 · 2cbe6a9
1 parent 1fc3b66
commit 2cbe6a9
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 10 deletions.
diff --git a/jquery.mCustomScrollbar.concat.min.js b/jquery.mCustomScrollbar.concat.min.js
diff --git a/jquery.mCustomScrollbar.css b/jquery.mCustomScrollbar.css
@@ -25,7 +25,7 @@ CONTENTS:
 */
 
 	.mCustomScrollbar{ -ms-touch-action: none; touch-action: none; /* MSPointer events - direct all pointer events to js */ }
-	.mCustomScrollbar.mCS_no_scrollbar{ -ms-touch-action: auto; touch-action: auto; }
+	.mCustomScrollbar.mCS_no_scrollbar, .mCustomScrollbar.mCS_touch_action{ -ms-touch-action: auto; touch-action: auto; }
 
 	.mCustomScrollBox{ /* contains plugin's markup */
 		position: relative;

diff --git a/jquery.mCustomScrollbar.js b/jquery.mCustomScrollbar.js
@@ -1271,6 +1271,7 @@ and dependencies (minified).
 			function _onTouchstart(e){
 				if(!_pointerTouch(e) || touchActive || _coordinates(e)[2]){touchable=0; return;}
 				touchable=1; touchDrag=0; docDrag=0;
+				$this.removeClass("mCS_touch_action");
 				var offset=mCSB_container.offset();
 				dragY=_coordinates(e)[0]-offset.top;
 				dragX=_coordinates(e)[1]-offset.left;
@@ -1294,7 +1295,13 @@ and dependencies (minified).
 					var limitX=mCSB_dragger[1].parent().width()-mCSB_dragger[1].width(),
 						preventX=((dragX-x)>0 && (x-dragX)>-(limitX*d.scrollRatio.x) && (touchIntent[2]*2<touchIntent[3] || o.axis==="yx"));
 				}
-				if(prevent || preventX){e.preventDefault(); touchDrag=1;}else{docDrag=1;} /* prevent native document scrolling */
+				if(prevent || preventX){ /* prevent native document scrolling */
+					e.preventDefault(); 
+					touchDrag=1;
+				}else{
+					docDrag=1;
+					$this.addClass("mCS_touch_action");
+				}
 				amount=o.axis==="yx" ? [(dragY-y),(dragX-x)] : o.axis==="x" ? [null,(dragX-x)] : [(dragY-y),null];
 				mCSB_container[0].idleTimer=250;
 				if(d.overflowed[0]){_drag(amount[0],durA,easing,"y","all",true);}

diff --git a/jquery.mCustomScrollbar.min.css b/jquery.mCustomScrollbar.min.css
diff --git a/js/minified/jquery.mCustomScrollbar.min.js b/js/minified/jquery.mCustomScrollbar.min.js
diff --git a/js/minified/jquery.mCustomScrollbar.min.js.gz b/js/minified/jquery.mCustomScrollbar.min.js.gz
diff --git a/js/uncompressed/jquery.mCustomScrollbar.js b/js/uncompressed/jquery.mCustomScrollbar.js
@@ -1271,6 +1271,7 @@ and dependencies (minified).
 			function _onTouchstart(e){
 				if(!_pointerTouch(e) || touchActive || _coordinates(e)[2]){touchable=0; return;}
 				touchable=1; touchDrag=0; docDrag=0;
+				$this.removeClass("mCS_touch_action");
 				var offset=mCSB_container.offset();
 				dragY=_coordinates(e)[0]-offset.top;
 				dragX=_coordinates(e)[1]-offset.left;
@@ -1294,7 +1295,13 @@ and dependencies (minified).
 					var limitX=mCSB_dragger[1].parent().width()-mCSB_dragger[1].width(),
 						preventX=((dragX-x)>0 && (x-dragX)>-(limitX*d.scrollRatio.x) && (touchIntent[2]*2<touchIntent[3] || o.axis==="yx"));
 				}
-				if(prevent || preventX){e.preventDefault(); touchDrag=1;}else{docDrag=1;} /* prevent native document scrolling */
+				if(prevent || preventX){ /* prevent native document scrolling */
+					e.preventDefault(); 
+					touchDrag=1;
+				}else{
+					docDrag=1;
+					$this.addClass("mCS_touch_action");
+				}
 				amount=o.axis==="yx" ? [(dragY-y),(dragX-x)] : o.axis==="x" ? [null,(dragX-x)] : [(dragY-y),null];
 				mCSB_container[0].idleTimer=250;
 				if(d.overflowed[0]){_drag(amount[0],durA,easing,"y","all",true);}