strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix resuming after idle

Browse source 
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 <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
(cherry picked from commit 8409f1ce2f6585aa82b0b21c7e9bb791f48b6a1b)
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100220
Tested-by: Jenkins
This commit is contained in:
Szymon Kłos 2020-08-06 14:27:59 +02:00
parent e857c1212b
commit 82cd3292ab
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
loleaflet/src/core/Socket.js
View file

@ -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;