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

[gokaysatir (via logerrit)]

 loleaflet/js/jquery.mCustomScrollbar.js  |    4 ++--
 loleaflet/package.json                   |    2 +-
 loleaflet/src/control/Control.Toolbar.js |    2 +-
 loleaflet/src/control/Toolbar.js         |    3 +++
 4 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 489155f3a747c4b7323b4f1d1186e7722dd44906
Author:     gokaysatir <gokaysatir at collabora.com>
AuthorDate: Wed Jun 10 13:16:31 2020 +0300
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Jun 11 13:00:52 2020 +0200

    leaflet: update jquery package.
    
    Change-Id: I1d637b957808ae5938cf2ee7fe5c3f20e6b9cc52
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/95856
    Tested-by: Jenkins
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/loleaflet/js/jquery.mCustomScrollbar.js b/loleaflet/js/jquery.mCustomScrollbar.js
index ffd8e1bba..f147bc2e8 100644
--- a/loleaflet/js/jquery.mCustomScrollbar.js
+++ b/loleaflet/js/jquery.mCustomScrollbar.js
@@ -883,9 +883,9 @@ and dependencies (minified).
 		_pluginMarkup=function(){
 			var $this=$(this),d=$this.data(pluginPfx),o=d.opt,
 				expandClass=o.autoExpandScrollbar ? " "+classes[1]+"_expand" : "",
-				scrollbar=["<div id='mCSB_"+d.idx+"_scrollbar_vertical' class='mCSB_scrollTools mCSB_"+d.idx+"_scrollbar mCS-"+o.theme+" mCSB_scrollTools_vertical"+expandClass+"'><div class='"+classes[12]+"'><div id='mCSB_"+d.idx+"_dragger_vertical' class='mCSB_dragger' style='position:absolute;' oncontextmenu='return false;'><div class='mCSB_dragger_bar' /></div><div class='mCSB_draggerRail' /></div></div>","<div id='mCSB_"+d.idx+"_scrollbar_horizontal' class='mCSB_scrollTools mCSB_"+d.idx+"_scrollbar mCS-"+o.theme+" mCSB_scrollTools_horizontal"+expandClass+"'><div class='"+classes[12]+"'><div id='mCSB_"+d.idx+"_dragger_horizontal' class='mCSB_dragger' style='position:absolute;' oncontextmenu='return false;'><div class='mCSB_dragger_bar' /></div><div class='mCSB_draggerRail' /></div></div>"],
+				scrollbar=["<div id='mCSB_"+d.idx+"_scrollbar_vertical' class='mCSB_scrollTools mCSB_"+d.idx+"_scrollbar mCS-"+o.theme+" mCSB_scrollTools_vertical"+expandClass+"'><div class='"+classes[12]+"'><div id='mCSB_"+d.idx+"_dragger_vertical' class='mCSB_dragger' style='position:absolute;' oncontextmenu='return false;'><div class='mCSB_dragger_bar'></div></div><div class='mCSB_draggerRail'></div></div></div>","<div id='mCSB_"+d.idx+"_scrollbar_horizontal' class='mCSB_scrollTools mCSB_"+d.idx+"_scrollbar mCS-"+o.theme+" mCSB_scrollTools_horizontal"+expandClass+"'><div class='"+classes[12]+"'><div id='mCSB_"+d.idx+"_dragger_horizontal' class='mCSB_dragger' style='position:absolute;' oncontextmenu='return false;'><div class='mCSB_dragger_bar'></div></div><div class='mCSB_draggerRail'></div></div></div>"],
 				wrapperClass=o.axis==="yx" ? "mCSB_vertical_horizontal" : o.axis==="x" ? "mCSB_horizontal" : "mCSB_vertical",
-				scrollbars=o.axis==="yx" ? scrollbar[0]+scrollbar[1] : o.axis==="x" ? scrollbar[1] : scrollbar[0],
+				scrollbars=o.axis==="yx" ? scrollbar[0]+scrollbar[1] : (o.axis==="x" ? scrollbar[1] : scrollbar[0]),
 				contentWrapper=o.axis==="yx" ? "<div id='mCSB_"+d.idx+"_container_wrapper' class='mCSB_container_wrapper' />" : "",
 				autoHideClass=o.autoHideScrollbar ? " "+classes[6] : "",
 				scrollbarDirClass=(o.axis!=="x" && d.langDir==="rtl") ? " "+classes[7] : "";
diff --git a/loleaflet/package.json b/loleaflet/package.json
index 7a1aba5d0..d081f4eb9 100644
--- a/loleaflet/package.json
+++ b/loleaflet/package.json
@@ -10,7 +10,7 @@
     "d3": "5.16.0",
     "eslint": "3.0.0",
     "hammerjs": "2.0.8",
-    "jquery": "2.2.4",
+    "jquery": "3.5.1",
     "jquery-contextmenu": "2.9.2",
     "jquery-mousewheel": "3.1.13",
     "jquery-ui-dist": "1.12.1",
diff --git a/loleaflet/src/control/Control.Toolbar.js b/loleaflet/src/control/Control.Toolbar.js
index 500ca36b5..4a797ffb0 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -476,7 +476,7 @@ function insertShapes(mobile) {
 	var width = 10;
 	var $grid = $('.insertshape-grid');
 
-	if ($grid.children().size() > 0)
+	if ($grid.children().length > 0)
 		return;
 
 	for (var s in shapes) {
diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index fdeec58af..2f6f28ad6 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -612,6 +612,9 @@ L.Map.include({
 					map.sendUnoCommand('.uno:SetHyperlink', command);
 					map.focus();
 				}
+				else {
+					map.focus();
+				}
 			}
 		});
 	}