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

[Pranav Kant]

 loleaflet/dist/loleaflet.css               |    6 +++++-
 loleaflet/src/control/Control.LokDialog.js |    6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 0a96e51c98e2672b074d59b87fa9470922fe2c08
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Tue Mar 27 15:13:41 2018 +0200

    lokdialog: Don't show the title bar when no title was provided.
    
    Change-Id: If08dc81e88d35a924d10695a38b138f6403e58bd
    Reviewed-on: https://gerrit.libreoffice.org/51955
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/loleaflet/dist/loleaflet.css b/loleaflet/dist/loleaflet.css
index e6389f06b..3ffd36737 100644
--- a/loleaflet/dist/loleaflet.css
+++ b/loleaflet/dist/loleaflet.css
@@ -339,6 +339,10 @@ body {
 	text-indent: 1px;
 }
 
+.lokdialog_container.lokdialog_notitle .ui-dialog-titlebar {
+	display: none;
+}
+
 .lokdialog_container.ui-dialog.ui-widget-content {
 	padding: 0px;
 	overflow: visible;
@@ -373,4 +377,4 @@ body {
 .vex.vex-theme-bottom-right-corner .vex-content {
 	bottom: 40px !important;
 	right: 10px !important;
-}
\ No newline at end of file
+}
diff --git a/loleaflet/src/control/Control.LokDialog.js b/loleaflet/src/control/Control.LokDialog.js
index 930655d2f..4f3e01d05 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -240,6 +240,10 @@ L.Control.LokDialog = L.Control.extend({
 
 		L.DomEvent.on(dialogCanvas, 'contextmenu', L.DomEvent.preventDefault);
 
+		var dialogClass = 'lokdialog_container';
+		if (!title)
+			dialogClass += ' lokdialog_notitle';
+
 		var that = this;
 		$(dialogContainer).dialog({
 			minWidth: width,
@@ -248,7 +252,7 @@ L.Control.LokDialog = L.Control.extend({
 			modal: false,
 			closeOnEscape: true,
 			resizable: false,
-			dialogClass: 'lokdialog_container',
+			dialogClass: dialogClass,
 			close: function() {
 				that._onDialogClose(that._toRawDlgId(strDlgId), true);
 			}