loleaflet/src/core/Socket.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 4f41ac60968d478fbbb27be0632b6defafe17744
Author: Tamás Zolnai <tamas.zol...@collabora.com>
AuthorDate: Fri Sep 18 16:29:01 2020 +0200
Commit: Tamás Zolnai <tamas.zol...@collabora.com>
CommitDate: Mon Sep 21 12:54:56 2020 +0200
Fix missing InputBar and sidebar in Calc.
_isReady() can be true even if the _docLayer is not
created yet and in this case we dropped the window
messages which should have triggered the input bar
and the sidebar creation.
cypress tests were failing because of this issue sometimes.
Change-Id: Ifda1d66c952c65c420db06bfd61918411426ae93
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/103010
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Tamás Zolnai <tamas.zol...@collabora.com>
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 750e98bd6..0cfe7003f 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -892,7 +892,7 @@ L.Socket = L.Class.extend({
}
var msgDelayed = false;
- if (!this._isReady() || this._delayedMessages.length ||
this._handlingDelayedMessages) {
+ if (!this._isReady() || !this._map._docLayer ||
this._delayedMessages.length || this._handlingDelayedMessages) {
msgDelayed = this._tryToDelayMessage(textMsg);
}
@@ -919,7 +919,7 @@ L.Socket = L.Class.extend({
},
_handleDelayedMessages: function() {
- if (!this._isReady() || this._handlingDelayedMessages) {
+ if (!this._isReady() || !this._map._docLayer ||
this._handlingDelayedMessages) {
var that = this;
// Retry in a bit.
this._delayedMsgHandlerTimeoutId =
setTimeout(function() {
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
