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

Hide infinite spinner and disconnect modals when pad is deleted

Browse Source
This commit is contained in:
yflory
2018-02-15 11:34:44 +01:00
parent ef0c08130d
commit 70e014cdfc
6 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
www/poll/inner.js
View File

@@ -1130,27 +1130,20 @@ define([
// Manage disconnections because of network or error
var onDisconnect = function (info) {
setEditable(false);
if (info && ['EEXPIRED', 'EDELETED'].indexOf(info.type) !== -1) {
APP.toolbar.deleted();
var msg = info.type;
if (info.type === 'EEXPIRED') {
msg = Messages.expiredError;
if (info.loaded) {
msg += Messages.expiredErrorCopy;
}
} else if (info.type === 'EDELETED') {
msg = Messages.deletedError;
if (info.loaded) {
msg += Messages.expiredErrorCopy;
}
}
return void UI.errorLoadingScreen(msg, true, true);
if (APP.unrecoverable) { return; }
if (info && info.type) {
// Server error
return void common.onServerError(info, APP.toolbar, function () {
APP.unrecoverable = true;
setEditable(false);
});
}
setEditable(false);
UI.alert(Messages.common_connectionLost, undefined, true);
};
var onReconnect = function () {
if (APP.unrecoverable) { return; }
setEditable(true);
UI.findOKButton().click();
};