strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Show progressbar on loading

Browse source 
Change-Id: Id2f6b35843380726e10570c2c3e501921e882b52
This commit is contained in:
Szymon Kłos 2018-11-21 16:04:10 +01:00 committed by Jan Holesovsky
parent db319170ba
commit d30ade3ff3
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
kit/Kit.cpp
View file

@ -1237,6 +1237,21 @@ public:
self->setDocumentPassword(type);
return;
}
else if(type == LOK_CALLBACK_STATUS_INDICATOR_SET_VALUE)
{
for (auto& it : self->_sessions)
{
std::shared_ptr<ChildSession> session = it.second;
if (session)
{
if (!it.second->isCloseFrame())
{
session->loKitCallback(type, payload);
}
}
}
return;
}
// Broadcast leftover status indicator callbacks to all clients
self->broadcastCallbackToClients(type, payload);

2
loleaflet/src/core/Socket.js
View file

@ -710,7 +710,7 @@ L.Socket = L.Class.extend({
}
else if (textMsg.startsWith('statusindicator:')) {
//FIXME: We should get statusindicator when saving too, no?
this._map.showBusy(_('Connecting...'), false);
this._map.showBusy(_('Connecting...'), true);
if (textMsg.startsWith('statusindicator: ready')) {
// We're connected: cancel timer and dialog.
this.ReconnectCount = 0;