[Libreoffice-commits] online.git: loleaflet/src

[Libreoffice Gerrit user]

 loleaflet/src/control/Control.Scroll.js |    2 +-
 loleaflet/src/map/handler/Map.Scroll.js |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 33d0b888ce6d090a8a5a55e5146af2daaa296e00
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Mon Nov 12 22:09:07 2018 +0000
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Tue Nov 13 15:12:41 2018 +0000

    Avoid scroll-wheel jittering, and shrink the scroll increment.
    
    Hypothetically the underlying cause is that malihu's
    scrollTo:function(val,options){ calculates data based on current state,
    dispatches asynchronous changes to that state, and can thus while
    that change is in-flight can mis-calculate subsequent changes - causing
    significant jitter.
    
    Change-Id: I3c8becead04582b05e30d7dfab233e898509cd75

diff --git a/loleaflet/src/control/Control.Scroll.js b/loleaflet/src/control/Control.Scroll.js
index 56a10a314..3f49ec4a0 100644
--- a/loleaflet/src/control/Control.Scroll.js
+++ b/loleaflet/src/control/Control.Scroll.js
@@ -169,7 +169,7 @@ L.Control.Scroll = L.Control.extend({
 		if (e.x < 0) {
 			x = '-=' + Math.abs(e.x);
 		}
-		$('.scroll-container').mCustomScrollbar('scrollTo', [y, x]);
+		$('.scroll-container').mCustomScrollbar('scrollTo', [y, x], { timeout: 1 });
 	},
 
 	_onScrollVelocity: function (e) {
diff --git a/loleaflet/src/map/handler/Map.Scroll.js b/loleaflet/src/map/handler/Map.Scroll.js
index a4bc8a466..9643def07 100644
--- a/loleaflet/src/map/handler/Map.Scroll.js
+++ b/loleaflet/src/map/handler/Map.Scroll.js
@@ -58,7 +58,7 @@ L.Map.Scroll = L.Handler.extend({
 	_performScroll: function () {
 		var map = this._map,
 		    delta = -this._delta,
-		    scrollAmount = Math.round(map.getSize().y / 4);
+		    scrollAmount = Math.round(map.getSize().y / 20);
 
 		this._delta = 0;
 		this._startTime = null;