loleaflet/src/core/Socket.js | 2 +-
loleaflet/src/map/Map.js | 17 +++++++++++++++--
2 files changed, 16 insertions(+), 3 deletions(-)
New commits:
commit b6448a8864aa05a9f779447cc43abcd47158e5dd
Author: Pranav Kant <pran...@collabora.co.uk>
Date: Fri Sep 23 11:34:24 2016 +0530
loleaflet: Move loading spinner to toolbar-down when doc loaded
Change-Id: If3ae7801b8438da490f1ceba2e61824518bdc94d
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index d1e8329..f456ce6 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -2,7 +2,7 @@
* L.Map is the central class of the API - it is used to create a map.
*/
-/* global vex $ */
+/* global vex $ w2ui w2utils */
L.Map = L.Evented.extend({
options: {
@@ -147,6 +147,13 @@ L.Map = L.Evented.extend({
},
showBusy: function(label, bar) {
+ // If document is already loaded, ask the toolbar widget to
show busy
+ // status on the bottom statusbar
+ if (this._docLayer) {
+ w2utils.lock(w2ui['toolbar-down'].box, label, true);
+ return;
+ }
+
this._progressBar.setLabel(label);
this._progressBar.setBar(bar);
this._progressBar.setValue(0);
@@ -157,7 +164,13 @@ L.Map = L.Evented.extend({
},
hideBusy: function () {
- this.removeLayer(this._progressBar);
+ if (w2ui['toolbar-down'].box.firstChild.className ===
'w2ui-lock') {
+ w2utils.unlock(w2ui['toolbar-down'].box);
+ }
+
+ if (this.hasLayer(this._progressBar)) {
+ this.removeLayer(this._progressBar);
+ }
},
setZoom: function (zoom, options) {
commit c23b37f352ec3ddf83f4d4d4a8ab1290368113fa
Author: Pranav Kant <pran...@collabora.co.uk>
Date: Fri Sep 23 11:12:52 2016 +0530
loleaflet: Better to have 'reconnected' signal here
Change-Id: I50c9484bb591d7192977fe49adb75f99d8ee1b08
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 3971f3e..e9a64f5 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -270,7 +270,7 @@ L.Socket = L.Class.extend({
} else if (textMsg.startsWith('status:')) {
// we are reconnecting ...
this._map._docLayer._onMessage('invalidatetiles:
EMPTY', null);
- this._map.fire('statusindicator', {statusType:
'finish'});
+ this._map.fire('statusindicator', {statusType:
'reconnected'});
this._map.setPermission(this._map.options.permission);
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
