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

indirection: fix ui flicker when migrating

Browse source 
Signed-off-by: Rash419 <rashesh.padia@collabora.com>
Change-Id: Ib435a08399179e33ee71736c1f36987e14fcaace
This commit is contained in:
Rash419 2023-09-07 19:26:47 +05:30 committed by Rashesh Padia
parent 790a19ab25
commit 68f147679a
1 changed files with 22 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
browser/src/core/Socket.js
View file

@ -588,29 +588,11 @@ app.definitions.Socket = L.Class.extend({
this.IndirectSocketReconnectCount = 0;
} else {
this._map.showBusy(_('Wrong server, reconnecting...'), false);
if (this._map._docLayer) {
this._map._docLayer.removeAllViews();
}
app.idleHandler._active = false;
// detach all the handlers
this.close();
// Reload the document
clearTimeout(this.timer);
setTimeout(function () {
try {
// Activate and cancel timer and dialogs.
app.idleHandler._activate();
} catch (error) {
window.app.console.warn('Cannot activate map');
}
}, 3000);
this.manualReconnect(2000);
return;
}
}
}
window.migrating = false;
$('#coolwsd-version-label').text(_('COOLWSD version:'));
var h = this.WSDServer.Hash;
@ -743,13 +725,12 @@ app.definitions.Socket = L.Class.extend({
this._map.uiManager.closeAll();
if (this._map.isEditMode()) {
this._map.setPermission('view');
this._map.uiManager.showSnackbar(_('Document is getting migrated...'));
this._map.uiManager.showSnackbar(_('Document is getting migrated'), null, null, 3000);
}
if (migrate.saved) {
window.routeToken = migrate.routeToken;
window.expectedServerId = migrate.serverId;
this.connect();
this._map.uiManager.closeAll();
this.manualReconnect(2000);
}
return;
}
@ -757,8 +738,7 @@ app.definitions.Socket = L.Class.extend({
if (migrate.saved) {
window.routeToken = migrate.routeToken;
window.expectedServerId = migrate.serverId;
this.connect();
this._map.uiManager.closeAll();
this.manualReconnect(2000);
} else {
this._map.setPermission(app.file.permission);
window.migrating = false;
@ -1431,8 +1411,9 @@ app.definitions.Socket = L.Class.extend({
this._map.fire('statusindicator', {statusType: 'reconnected'});
this._map._isNotebookbarLoadedOnCore = false;
var uiMode = this._map.uiManager.getCurrentMode();
this._map.fire('changeuimode', {mode: uiMode, force: true});
this._map.fire('changeuimode', {mode: uiMode, force: !window.migrating});
this._map.setPermission(app.file.permission);
window.migrating = false;
}
this._map.fire('docloaded', {status: true});
@ -1871,5 +1852,21 @@ app.definitions.Socket = L.Class.extend({
return this.createCompleteTraceEvent(pretty, { message: textMsg });
},
manualReconnect: function(timeout) {
if (this._map._docLayer) {
this._map._docLayer.removeAllViews();
}
app.idleHandler._active = false;
this.close();
clearTimeout(this.timer);
setTimeout(function () {
try {
app.idleHandler._activate();
} catch (error) {
window.app.console.warn('Cannot activate map');
}
}, timeout);
},
threadLocalLoggingLevelToggle: false
});