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

[Libreoffice Gerrit user]

 loleaflet/css/loleaflet.css                |    2 +-
 loleaflet/src/control/Control.LokDialog.js |    9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 32c98a4c8815fd9e73842d79d4c6884889c1db74
Author:     Henry Castro <hcastro at collabora.com>
AuthorDate: Tue Oct 16 12:51:50 2018 -0400
Commit:     Henry Castro <hcastro at collabora.com>
CommitDate: Tue Oct 16 20:08:17 2018 -0400

    loleaflet: mobile: fix scrolling the dialogs
    
    Change-Id: I5279cffca4b4d66fbc35a4a8ae4b3ffdfe70a215

diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index 5fb1d9a0a..cd211adcb 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -401,7 +401,7 @@ body {
 
 .lokdialog.ui-dialog-content.ui-widget-content {
 	padding: 0px;
-	overflow: visible;
+	overflow: auto;
 }
 
 .lokdialog_canvas {
diff --git a/loleaflet/src/control/Control.LokDialog.js b/loleaflet/src/control/Control.LokDialog.js
index 6e85da686..7684aff2b 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -251,10 +251,13 @@ L.Control.LokDialog = L.Control.extend({
 		if (!title)
 			dialogClass += ' lokdialog_notitle';
 
-		var that = this;
+		var that = this,
+		    size = this._map.getSize();
 		$(dialogContainer).dialog({
-			minWidth: width,
-			width: width,
+			minWidth: size.x,
+			width: Math.min(width, size.x),
+			maxHeight: $(window).height(),
+			height: 'auto',
 			title: title ? title : '',
 			modal: false,
 			closeOnEscape: true,