[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2' - loleaflet/src

[Pranam Lashkari (via logerrit)]

 loleaflet/src/core/Socket.js |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 40cf3253bbeb63369954bfda58cb7614aac68565
Author:     Pranam Lashkari <lpranam at collabora.com>
AuthorDate: Mon Jul 20 22:53:52 2020 +0530
Commit:     Pranam Lashkari <lpranam at collabora.com>
CommitDate: Mon Jul 27 17:16:04 2020 +0200

    leaflet: resolved Formula bar disappears after session timeout
    
    calcinputbar used to disappear because of no proper initialization after
    sassion timeout and that set the wrong width which caused this problem
    
    this makes sure that when reconnecting after session timeout,
    first inputbar is unloaded and reloaded properly like first time
    (when doc was opened)
    
    Change-Id: Ifbf856d0e565e14b2ef697f342ef6d8e63a5fbd2
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/96953
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Jenkins
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    (cherry picked from commit 91dc50696655a56c312f08f7fbf06eb57ce0f258)
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99291
    Reviewed-by: Pranam Lashkari <lpranam at collabora.com>

diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index f950194cc..b26fd758b 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -484,6 +484,8 @@ L.Socket = L.Class.extend({
 					{
 						console.debug('idleness: reactivating');
 						map._documentIdle = false;
+						// force reinitialization of calcInputBar(formulabar)
+						map.dialog._calcInputBar.id = null;
 						return map._activate();
 					}
 					return false;