[Libreoffice-commits] online.git: Branch 'libreoffice-5-3' - loleaflet/src

Ashod Nakashian ashod.nakashian at collabora.co.uk
Mon Mar 27 01:25:39 UTC 2017


 loleaflet/src/core/Socket.js |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 75c17fdb3c173d9cd16fbe9744ffcaaabb232052
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/35575
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index a7c18ebc..cc962d30 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -413,7 +413,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);
@@ -460,6 +460,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