loleaflet/src/core/Socket.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 82cd3292ab8ef87e3cb6f9ebb066ec99bc23d9ed
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Thu Aug 6 14:27:59 2020 +0200
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Thu Aug 6 16:05:16 2020 +0200
Fix resuming after idle
In other apps than Calc there was an error when trying
to resume after idle:
Uncaught TypeError: Cannot set property 'id' of null
at HTMLDivElement.restartConnectionFn (Socket.js:490)
Change-Id: I0b3c8d907aa220a3b9504ff62b0437c121bd3619
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100241
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
(cherry picked from commit 8409f1ce2f6585aa82b0b21c7e9bb791f48b6a1b)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100220
Tested-by: Jenkins
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 526c51410..310dbbd22 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -500,7 +500,8 @@ L.Socket = L.Class.extend({
console.debug('idleness:
reactivating');
map._documentIdle = false;
// force reinitialization of
calcInputBar(formulabar)
- map.dialog._calcInputBar.id =
null;
+ if (map.dialog._calcInputBar)
+
map.dialog._calcInputBar.id = null;
return map._activate();
}
return false;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
