blitzwing/cryptpad
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix race condition in framework

Browse source
This commit is contained in:
yflory 2020-12-08 11:19:38 +01:00
parent 384200860b
commit e8cdbf6630
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
www/common/sframe-app-framework.js
View file

@ -221,6 +221,10 @@ define([
evStart.reg(function () { toolbar.deleted(); });
break;
}
case STATE.READY: {
evStart.reg(function () { toolbar.ready(); });
break;
}
default:
}
var isEditable = (state === STATE.READY && !unsyncMode);
@ -479,7 +483,7 @@ define([
sframeChan.event("EV_CORRUPTED_CACHE");
};
var onCacheReady = function () {
stateChange(STATE.DISCONNECTED);
stateChange(STATE.INITIALIZING);
toolbar.offline(true);
var newContentStr = cpNfInner.chainpad.getUserDoc();
if (toolbar) {
@ -526,7 +530,6 @@ define([
var privateDat = cpNfInner.metadataMgr.getPrivateData();
var type = privateDat.app;
// contentUpdate may be async so we need an nthen here
nThen(function (waitFor) {
if (!newPad) {
@ -783,7 +786,7 @@ define([
onRemote: onRemote,
onLocal: onLocal,
onInit: onInit,
onCacheReady: onCacheReady,
onCacheReady: function () { evStart.reg(onCacheReady); },
onReady: function () { evStart.reg(onReady); },
onConnectionChange: onConnectionChange,
onError: onError,

4
www/common/toolbar.js
View file

@ -1318,6 +1318,10 @@ MessengerUI, Messages) {
toolbar.spinner.text(Messages.reconnecting);
}
};
toolbar.ready = function () {
toolbar.connected = true;
kickSpinner(toolbar, config);
};
toolbar.errorState = function (state, error) {
toolbar.isErrorState = state;