Fix touch bugs

ONLYOFFICE · Oct 2, 2024 · 8d0d748 · 8d0d748
1 parent fb4622d
commit 8d0d748
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/cell/view/mobileTouch.js b/cell/view/mobileTouch.js
@@ -530,7 +530,7 @@ function (window, undefined)
 
 		this.iScroll = new window.IScrollMobile(_element, {
 			scrollbars: true,
-			mouseWheel: true,
+			mouseWheel: !this.isDesktopMode,
 			interactiveScrollbars: true,
 			shrinkScrollbars: 'scale',
 			fadeScrollbars: true,

diff --git a/common/Scrolls/mobileTouchManagerBase.js b/common/Scrolls/mobileTouchManagerBase.js
@@ -1695,8 +1695,6 @@
 			ctx.fillStyle = targetElement.style.backgroundColor;
 			ctx.fill();
 			ctx.beginPath();
-
-			this.isGlassDrawed = true;
 		}
 
 		ctx.beginPath();
@@ -1709,6 +1707,8 @@
 		overlay.CheckRect(posMouseX - rad, posMouseY - glassOffset - glassSize, glassSize, glassSize);
 
 		ctx.restore();
+
+		this.isGlassDrawed = true;
 	};
 
 	// отрисовка текстового селекта

diff --git a/slide/Drawing/mobileTouchManager.js b/slide/Drawing/mobileTouchManager.js
@@ -387,7 +387,7 @@
 
 		this.iScroll = new window.IScrollMobile(_element, {
 			scrollbars: true,
-			mouseWheel: true,
+			mouseWheel: !this.isDesktopMode,
 			interactiveScrollbars: true,
 			shrinkScrollbars: 'scale',
 			fadeScrollbars: true,
@@ -1190,7 +1190,7 @@
 
 		this.iScroll = new window.IScrollMobile(_element, {
 			scrollbars: true,
-			mouseWheel: true,
+			mouseWheel: !this.isDesktopMode,
 			interactiveScrollbars: true,
 			shrinkScrollbars: 'scale',
 			fadeScrollbars: true,

diff --git a/word/Drawing/mobileTouchManager.js b/word/Drawing/mobileTouchManager.js
@@ -62,7 +62,7 @@
 
 		this.iScroll = new window.IScrollMobile(_element, {
 			scrollbars: true,
-			mouseWheel: true,
+			mouseWheel: !this.isDesktopMode,
 			interactiveScrollbars: true,
 			shrinkScrollbars: 'scale',
 			fadeScrollbars: true,
@@ -806,7 +806,7 @@
 
 		this.iScroll = new window.IScrollMobile(this.delegate.GetScrollerParent(), {
 			scrollbars: true,
-			mouseWheel: true,
+			mouseWheel: !this.isDesktopMode,
 			interactiveScrollbars: true,
 			shrinkScrollbars: 'scale',
 			fadeScrollbars: true,