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

[Tamás Zolnai (via logerrit)]

 loleaflet/src/core/Socket.js |   16 ++++++++++++++++
 loleaflet/src/map/Map.js     |    7 ++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

New commits:
commit 78fc78827227b783c6e302dcfbc5f9c3b1fca1df
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Thu Aug 29 15:52:17 2019 +0200
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Fri Oct 25 17:11:13 2019 +0100

    Dialog: can't get back to it after clicking into the URL bar
    
    Change-Id: Ibc4951f256245eddb56eb2c28026906515535c08

diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 09e7cbd98..b4fc79082 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -1362,7 +1362,12 @@ L.Map = L.Evented.extend({
 
 	// Our browser tab got focus.
 	_onGotFocus: function () {
-		this._onEditorGotFocus();
+		if (this._activeDialog === null) {
+			this._onEditorGotFocus();
+		} else {
+			this._activeDialog.focus();
+		}
+
 		this._activate();
 	},
 
commit a6bf52f4a2b898b76bb9030a6eb153b81a572598
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Fri Jul 26 14:03:52 2019 +0200
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Fri Oct 25 17:10:48 2019 +0100

    viewInfo: Fix missing user avatars by the first load of a document
    
    We need to add a delay to the processing of viewinfo message
    to make sure it is processed by the _docLayer.
    
    See also this commit:
    b0317d0ff461100ce9f0ba805cb18e5d829947e2
    The above commit adds a delay to the status message processing
    which is a dependency of handling the viewinfo correctly, so
    I added a similar delay here too.

diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index fcc62e83b..94454b82d 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -794,6 +794,10 @@ L.Socket = L.Class.extend({
 				return;
 			}
 		}
+		else if (textMsg.startsWith('viewinfo:')) {
+			this._onViewInfoMsg(textMsg);
+			return;
+		}
 
 		if (this._map._docLayer) {
 			this._map._docLayer._onMessage(textMsg, img);
@@ -900,6 +904,18 @@ L.Socket = L.Class.extend({
 		}
 	},
 
+	_onViewInfoMsg: function(textMsg) {
+		if (this._map._docLayer) {
+			this._map._docLayer._onMessage(textMsg);
+		}
+		else {
+			var that = this;
+			setTimeout(function() {
+				that._onViewInfoMsg(textMsg);
+			}, 100);
+		}
+	},
+
 	_onSocketError: function () {
 		console.debug('_onSocketError:');
 		this._map.hideBusy();