[Libreoffice-commits] online.git: loleaflet/src

Henry Castro hcastro at collabora.com
Wed Apr 13 20:31:41 UTC 2016


 loleaflet/src/core/Socket.js          |    3 +++
 loleaflet/src/layer/tile/TileLayer.js |    1 +
 2 files changed, 4 insertions(+)

New commits:
commit 87eeac808be9d9dfef1825fc0b40fbead65973d2
Author: Henry Castro <hcastro at collabora.com>
Date:   Wed Apr 13 16:29:25 2016 -0400

    loleaflet: show "Connecting..." before websocket is ready

diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index ccb63be..ed15923 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -144,6 +144,9 @@ L.Socket = L.Class.extend({
 				return;
 			}
 		}
+		else if (textMsg.startsWith('statusindicator:')) {
+			this._map.showBusy('Connecting...', false);
+		}
 		else if (!textMsg.startsWith('tile:') && !textMsg.startsWith('renderfont:')) {
 			// log the tile msg separately as we need the tile coordinates
 			L.Log.log(textMsg, L.INCOMING);
diff --git a/loleaflet/src/layer/tile/TileLayer.js b/loleaflet/src/layer/tile/TileLayer.js
index 356f7b7..07e4523 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -766,6 +766,7 @@ L.TileLayer = L.GridLayer.extend({
 		if (e.msg) {
 			this._map.setPermission('view');
 		}
+		this._map.hideBusy();
 	},
 
 	_onTileRemove: function (e) {


More information about the Libreoffice-commits mailing list