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

[Szymon KÅ‚os (via logerrit)]

 loleaflet/src/control/Control.JSDialogBuilder.js |    3 ++-
 loleaflet/src/control/Control.Notebookbar.js     |    5 +++++
 loleaflet/src/layer/tile/TileLayer.js            |    6 ++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 3170684c48b8eec51953feefa068943211787547
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Tue Jun 16 11:53:42 2020 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Fri Jun 26 14:09:36 2020 +0200

    notebookbar: show when message arrives
    
    Change-Id: Ib826c0ae2be1590233c4a16c24b548424d501eca
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/97207
    Tested-by: Jenkins
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js b/loleaflet/src/control/Control.JSDialogBuilder.js
index c18986d67..2542e707b 100644
--- a/loleaflet/src/control/Control.JSDialogBuilder.js
+++ b/loleaflet/src/control/Control.JSDialogBuilder.js
@@ -231,7 +231,8 @@ L.Control.JSDialogBuilder = L.Control.extend({
 		} else if (object) {
 			data = typeof data === 'string' ? data.replace('"', '\\"') : data;
 			var windowId = window.mobileDialogId !== undefined ? window.mobileDialogId :
-								(window.sidebarId !== undefined ? window.sidebarId : -1);
+								(window.notebookbarId !== undefined ? window.notebookbarId :
+								(window.sidebarId !== undefined ? window.sidebarId : -1));
 			var message = 'dialogevent ' + windowId
 			    + ' {\"id\":\"' + object.id
 				+ '\", \"cmd\": \"' + eventType
diff --git a/loleaflet/src/control/Control.Notebookbar.js b/loleaflet/src/control/Control.Notebookbar.js
index b18dcf611..71b801fca 100644
--- a/loleaflet/src/control/Control.Notebookbar.js
+++ b/loleaflet/src/control/Control.Notebookbar.js
@@ -18,6 +18,11 @@ L.Control.Notebookbar = L.Control.extend({
 		this.setupResizeHandler();
 
 		this.map.on('contextchange', this.onContextChange, this);
+		this.map.on('notebookbar', this.onNotebookbar, this);
+	},
+
+	onNotebookbar: function(data) {
+		this.loadTab(data);
 	},
 
 	clearNotebookbar: function() {
diff --git a/loleaflet/src/layer/tile/TileLayer.js b/loleaflet/src/layer/tile/TileLayer.js
index eb0a7b14a..f666ce519 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -1004,6 +1004,12 @@ L.TileLayer = L.GridLayer.extend({
 			} else {
 				this._closeMobileWizard();
 			}
+		} else {
+			msgData = JSON.parse(textMsg.substring('jsdialog:'.length + 1));
+			if (msgData.type == 'borderwindow') {
+				window.notebookbarId = msgData.id;
+				this._map.fire('notebookbar', msgData.children[2]);
+			}
 		}
 	},