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

[Pranav Kant]

 loleaflet/src/control/Control.LokDialog.js |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 4bf18a7bd2b96311d39abb92f1a9a3826db94515
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Mon Jan 15 16:47:04 2018 +0530

    loleaflet: Delay showing of dialog until we have the content
    
    Change-Id: I5d29e64011931fc285191eb713f8cf746dbc6963
    (cherry picked from commit 1f410064da480520050a00c5a6507c80e1d272b7)
    Reviewed-on: https://gerrit.libreoffice.org/47896
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/loleaflet/src/control/Control.LokDialog.js b/loleaflet/src/control/Control.LokDialog.js
index 82f69130..21d8a6e5 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -202,6 +202,8 @@ L.Control.LokDialog = L.Control.extend({
 				that._onDialogClose(that._toRawDlgId(strDlgId), true);
 			}
 		});
+		// don't show the dialog surround until we have the dialog content
+		$(dialogContainer).parent().hide();
 
 		this._dialogs[this._toRawDlgId(strDlgId)] = {
 			open: true,
@@ -270,6 +272,10 @@ L.Control.LokDialog = L.Control.extend({
 			}
 
 			ctx.drawImage(img, x, y);
+
+			// if dialog is hidden, show it
+			var dialogContainer = L.DomUtil.get(strDlgId);
+			$(dialogContainer).parent().show();
 		};
 		img.src = imgData;
 	},