[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4-0' - loleaflet/js loleaflet/src

[Tor Lillqvist (via logerrit)]

 loleaflet/js/jquery.mCustomScrollbar.js |    3 +--
 loleaflet/src/control/Control.Scroll.js |    6 +-----
 loleaflet/src/layer/tile/TileLayer.js   |    6 +-----
 3 files changed, 3 insertions(+), 12 deletions(-)

New commits:
commit 798311db942ab291b12ccf1ec51cc819a8e782b7
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Thu Jan 24 12:55:00 2019 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Jun 13 10:17:32 2019 +0200

    tdf#122359: Un-revert and edit in a attempt to reach a compromise
    
    Change-Id: I0f23c70b3c4a07bae24e490eb8d1a5e56a4ba9ee
    Reviewed-on: https://gerrit.libreoffice.org/70289
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>
    (cherry picked from commit 4506d7c2de2c20c4211300ac58cecd2a42e7bb27)
    Reviewed-on: https://gerrit.libreoffice.org/73934
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/loleaflet/js/jquery.mCustomScrollbar.js b/loleaflet/js/jquery.mCustomScrollbar.js
index 2785ec65c..abaa9b9e0 100644
--- a/loleaflet/js/jquery.mCustomScrollbar.js
+++ b/loleaflet/js/jquery.mCustomScrollbar.js
@@ -2138,8 +2138,7 @@ and dependencies (minified).
 						// hidden part of the document (for instance when pressing enter on the
 						// last visible line). The options.timeout==1 is a silly way to detect
 						// the mouse-wheel scrolling.
-						if((window.ThisIsAMobileApp && (options.drag || options.timeout===1 || options.calledFromInvalidateCursorMsg==true)) ||
-						   (!window.ThisIsAMobileApp)) {
+						if(!window.ThisIsAMobileApp || options.drag || options.timeout===1 || options.calledFromInvalidateCursorMsg==true){
 							/* callbacks: whileScrolling */
 							if(_cb("whileScrolling")){_mcs(); o.callbacks.whileScrolling.call(el[0]);}
 						}
diff --git a/loleaflet/src/control/Control.Scroll.js b/loleaflet/src/control/Control.Scroll.js
index adb85d55b..ab3fc47c6 100644
--- a/loleaflet/src/control/Control.Scroll.js
+++ b/loleaflet/src/control/Control.Scroll.js
@@ -158,11 +158,7 @@ L.Control.Scroll = L.Control.extend({
 
 	_onScrollTo: function (e) {
 		// triggered by the document (e.g. search result out of the viewing area)
-		if (window.ThisIsAMobileApp) {
-			$('.scroll-container').mCustomScrollbar('scrollTo', [e.y, e.x], {calledFromInvalidateCursorMsg: e.calledFromInvalidateCursorMsg});
-		} else {
-			$('.scroll-container').mCustomScrollbar('scrollTo', [e.y, e.x]);
-		}
+		$('.scroll-container').mCustomScrollbar('scrollTo', [e.y, e.x], {calledFromInvalidateCursorMsg: e.calledFromInvalidateCursorMsg});
 	},
 
 	_onScrollBy: function (e) {
diff --git a/loleaflet/src/layer/tile/TileLayer.js b/loleaflet/src/layer/tile/TileLayer.js
index 00759ca65..661f4f82c 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -1634,11 +1634,7 @@ L.TileLayer = L.GridLayer.extend({
 			if (!zoom && !(this._selectionHandles.start && this._selectionHandles.start.isDragged) &&
 			    !(this._selectionHandles.end && this._selectionHandles.end.isDragged) &&
 			    !(docLayer._followEditor || docLayer._followUser)) {
-				if (window.ThisIsAMobileApp) {
-					this._map.fire('scrollto', {x: center.x, y: center.y, calledFromInvalidateCursorMsg: scroll !== undefined});
-				} else {
-					this._map.fire('scrollto', {x: center.x, y: center.y});
-				}
+				this._map.fire('scrollto', {x: center.x, y: center.y, calledFromInvalidateCursorMsg: scroll !== undefined});
 			}
 		}