web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix allow list UI issues

Browse Source
This commit is contained in:
yflory
2020-03-06 12:55:20 +01:00
parent 6d8cdca7a3
commit 62725caace
7 changed files with 34 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
www/common/sframe-app-framework.js
View File

@@ -161,6 +161,10 @@ define([
}
case STATE.ERROR: {
evStart.reg(function () {
if (text === 'ERESTRICTED') {
toolbar.failed(true);
return;
}
toolbar.errorState(true, text);
var msg = Messages.chainpadError;
UI.errorLoadingScreen(msg, true, true);
@@ -171,6 +175,10 @@ define([
evStart.reg(function () { toolbar.forgotten(); });
break;
}
case STATE.FORBIDDEN: {
evStart.reg(function () { toolbar.deleted(); });
break;
}
case STATE.DELETED: {
evStart.reg(function () { toolbar.deleted(); });
break;
@@ -403,7 +411,11 @@ define([
};
var onError = function (err) {
common.onServerError(err, toolbar, function () {
common.onServerError(err, null, function () {
if (err.type === 'ERESTRICTED') {
stateChange(STATE.ERROR, err.type);
return;
}
stateChange(STATE.DELETED);
});
};