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

[Szymon Kłos (via logerrit)]

 loleaflet/js/jquery.mCustomScrollbar.js |    9 +++++++++
 1 file changed, 9 insertions(+)

New commits:
commit c395f4ee91fb2791d2259eb59e3d750daa05f46b
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Thu Apr 4 18:36:21 2019 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Jun 13 10:17:51 2019 +0200

    Calc scrolling with selection fix
    
    Scrolling with selected sheet was endless.
    This change allows scrolling using mouse wheel
    when scrollbar is close to the end of screen
    and prevents from doubled updates.
    
    Extension of work done before in:
    ec24337b11e097e98266c51d8fe56c42a8ec613a
    
    Change-Id: Id76818158c0d9988b323ec52a408efd5ae6a9da5
    Reviewed-on: https://gerrit.libreoffice.org/70266
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
    Tested-by: Szymon Kłos <szymon.klos at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/70290
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>
    (cherry picked from commit 64949d2a044986ef992e323ad675e0c808496563)
    Reviewed-on: https://gerrit.libreoffice.org/73935
    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 abaa9b9e0..14bf9d9a2 100644
--- a/loleaflet/js/jquery.mCustomScrollbar.js
+++ b/loleaflet/js/jquery.mCustomScrollbar.js
@@ -643,6 +643,15 @@ and dependencies (minified).
 					
 					if($this.data(pluginPfx)){ /* check if plugin has initialized */
 					
+						/* Ugly hack extension: When vertical scrollbar position
+						   was very close to the end of spreadsheet, next part of
+						   the document has to be loaded. This contidion is fulfilled
+						   in that case. We need to ignore it to prevent scrollbar
+						   from reaching the end what blocks possibility to scroll down. */
+						if(!window.ThisIsAMobileApp && options && options.timeout == undefined
+							&& options.calledFromInvalidateCursorMsg == undefined)
+							return;
+
 						var d=$this.data(pluginPfx),o=d.opt,
 							/* method default options */
 							methodDefaults={