[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - loleaflet/src
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Aug 30 06:37:50 UTC 2018
loleaflet/src/core/Socket.js | 1 +
loleaflet/src/map/Map.js | 2 ++
2 files changed, 3 insertions(+)
New commits:
commit 59296494f1f91223e7eec5987447d6537e987afe
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Wed Aug 29 23:26:26 2018 +0200
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Aug 30 08:37:43 2018 +0200
Make tilerendering working again after connection lost
(cherry picked from commit ab7943edd6dff69d729bfd5fb042c3483d449102)
Change-Id: If3d1368e74437548297c80f5a10de48ba47aac52
Reviewed-on: https://gerrit.libreoffice.org/59784
Reviewed-by: Andras Timar <andras.timar at collabora.com>
Tested-by: Andras Timar <andras.timar at collabora.com>
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index cc7f94257..b07e4c098 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -748,6 +748,7 @@ L.Socket = L.Class.extend({
else if (this._reconnecting) {
// we are reconnecting ...
this._reconnecting = false;
+ this._map._docLayer.viewReset();
this._map._docLayer._onMessage('invalidatetiles: EMPTY', null);
this._map.fire('statusindicator', {statusType: 'reconnected'});
this._map.setPermission(this._map.options.permission);
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index d04c2e817..f93606bc2 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -818,6 +818,8 @@ L.Map = L.Evented.extend({
this._active = true;
if (this._doclayer) {
this._docLayer._onMessage('invalidatetiles: EMPTY', null);
+ this._docLayer._clientVisibleArea = '';
+ this._docLayer._clientZoom = '';
}
if (vex.dialogID > 0) {
More information about the Libreoffice-commits
mailing list