[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-0' - loleaflet/src
Ashod Nakashian
ashod.nakashian at collabora.co.uk
Mon Feb 13 14:09:07 UTC 2017
loleaflet/src/core/Socket.js | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 850b368276cf2cf044d72b4146356bfa92de4bcc
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date: Sun Feb 12 22:59:48 2017 -0500
loleaflet: reconnect silently when disconnected
Change-Id: I7761dcfd283e9b24fd70d255899d438209103a22
Reviewed-on: https://gerrit.libreoffice.org/34190
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 d18a873..64fdf16 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -471,7 +471,7 @@ L.Socket = L.Class.extend({
this._map.fire('doclayerinit');
} else if (textMsg.startsWith('status:') && this._reconnecting) {
// we are reconnecting ...
- this._reconecting = false;
+ this._reconnecting = false;
this._map._docLayer._onMessage('invalidatetiles: EMPTY', null);
this._map.fire('statusindicator', {statusType: 'reconnected'});
this._map.setPermission(this._map.options.permission);
@@ -518,6 +518,11 @@ L.Socket = L.Class.extend({
// Reset wopi's app loaded so that reconnecting again informs outerframe about initialization again
this._map['wopi'].resetAppLoaded();
+
+ if (!this._reconnecting) {
+ this._reconnecting = true;
+ this._map._activate();
+ }
},
parseServerCmd: function (msg) {
More information about the Libreoffice-commits
mailing list