[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - loleaflet/dist loleaflet/src

[Jan Holesovsky]

 loleaflet/dist/loleaflet.css               |    5 +++--
 loleaflet/src/control/Control.LokDialog.js |    9 ---------
 2 files changed, 3 insertions(+), 11 deletions(-)

New commits:
commit 5b140f1bfd332aeb9a8544b765b754eea1c8a608
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Mon Mar 12 16:48:29 2018 +0100

    lokdialog: Don't strip the sub-menus in tunneled context menu.
    
    Simplifies the vertical growing / shrinking of listbox popups too.
    
    Change-Id: I8d8aa7e07a5bf9119713363dd95a5db843683feb
    Reviewed-on: https://gerrit.libreoffice.org/51154
    Reviewed-by: pranavk <pranavk at collabora.co.uk>
    Tested-by: pranavk <pranavk at collabora.co.uk>

diff --git a/loleaflet/dist/loleaflet.css b/loleaflet/dist/loleaflet.css
index fac0c79cb..e6389f06b 100644
--- a/loleaflet/dist/loleaflet.css
+++ b/loleaflet/dist/loleaflet.css
@@ -341,7 +341,7 @@ body {
 
 .lokdialog_container.ui-dialog.ui-widget-content {
 	padding: 0px;
-	overflow: hidden;
+	overflow: visible;
 	width: auto;
 	height: auto;
 	border: none;
@@ -350,7 +350,8 @@ body {
 }
 
 .lokdialog.ui-dialog-content.ui-widget-content {
-        padding: 0px;
+	padding: 0px;
+	overflow: visible;
 }
 
 .lokdialog_canvas {
diff --git a/loleaflet/src/control/Control.LokDialog.js b/loleaflet/src/control/Control.LokDialog.js
index 7b43848ba..11a18ce78 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -227,7 +227,6 @@ L.Control.LokDialog = L.Control.extend({
 		var dialogContainer = L.DomUtil.create('div', 'lokdialog', document.body);
 		L.DomUtil.setStyle(dialogContainer, 'padding', '0px');
 		L.DomUtil.setStyle(dialogContainer, 'margin', '0px');
-		L.DomUtil.setStyle(dialogContainer, 'overflow', 'hidden');
 		dialogContainer.id = strDlgId;
 
 		var dialogCanvas = L.DomUtil.create('canvas', 'lokdialog_canvas', dialogContainer);
@@ -373,14 +372,6 @@ L.Control.LokDialog = L.Control.extend({
 			ctx.drawImage(img, 0, 0);
 		};
 		img.src = imgData;
-
-		// increase the height of the container,
-		// so that if the floating window goes out of the parent,
-		// it doesn't get stripped off
-		height = parseInt(canvas.style.top) + canvas.height;
-		var currentHeight = parseInt($('#' + strDlgId).css('height'));
-		if (height > currentHeight)
-			$('#' + strDlgId).css('height', height + 'px');
 	},
 
 	_onDialogChildClose: function(dialogId) {