libretic
/
etherpad-lite
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pad_impexp: Invert logic to improve readability

This commit is contained in:
Richard Hansen 2021-02-07 20:23:15 -05:00 committed by John McLear
parent ce4ce8ce95
commit efe07cd027
1 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/static/js/pad_impexp.js
View File

@ -44,31 +44,29 @@ const padimpexp = (() => {
const fileInputSubmit = () => {
$('#importmessagefail').fadeOut('fast');
const ret = window.confirm(html10n.get('pad.impexp.confirmimport'));
if (ret) {
currentImportTimer = window.setTimeout(() => {
if (!currentImportTimer) {
return;
}
currentImportTimer = null;
importErrorMessage('Request timed out.');
importDone();
}, 25000); // time out after some number of seconds
$('#importsubmitinput').attr(
if (!window.confirm(html10n.get('pad.impexp.confirmimport'))) return false;
currentImportTimer = window.setTimeout(() => {
if (!currentImportTimer) {
return;
}
currentImportTimer = null;
importErrorMessage('Request timed out.');
importDone();
}, 25000); // time out after some number of seconds
$('#importsubmitinput').attr(
{
disabled: true,
}).val(html10n.get('pad.impexp.importing'));
window.setTimeout(() => {
$('#importfileinput').attr(
{
disabled: true,
}).val(html10n.get('pad.impexp.importing'));
window.setTimeout(() => {
$('#importfileinput').attr(
{
disabled: true,
});
}, 0);
$('#importarrow').stop(true, true).hide();
$('#importstatusball').show();
}
return ret;
});
}, 0);
$('#importarrow').stop(true, true).hide();
$('#importstatusball').show();
return true;
};
const importDone = () => {