libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-02-01 03:12:42 +01:00
Code Issues Projects Releases Wiki Activity

pad_impexp: Delete unnecessary importFailed wrapper

Browse source
This commit is contained in:
Richard Hansen 2020-10-05 21:12:07 -04:00 committed by John McLear
parent 8a221ca773
commit ce4ce8ce95
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/static/js/pad_impexp.js
View file

@ -51,7 +51,7 @@ const padimpexp = (() => {
return; return;
} }
currentImportTimer = null; currentImportTimer = null;
importFailed('Request timed out.'); importErrorMessage('Request timed out.');
importDone(); importDone();
}, 25000); // time out after some number of seconds }, 25000); // time out after some number of seconds
$('#importsubmitinput').attr( $('#importsubmitinput').attr(
@ -71,10 +71,6 @@ const padimpexp = (() => {
return ret; return ret;
}; };
const importFailed = (msg) => {
importErrorMessage(msg);
};
const importDone = () => { const importDone = () => {
$('#importsubmitinput').removeAttr('disabled').val(html10n.get('pad.impexp.importbutton')); $('#importsubmitinput').removeAttr('disabled').val(html10n.get('pad.impexp.importbutton'));
window.setTimeout(() => { window.setTimeout(() => {
@ -196,7 +192,7 @@ const padimpexp = (() => {
handleFrameCall: (directDatabaseAccess, status) => { handleFrameCall: (directDatabaseAccess, status) => {
if (directDatabaseAccess === 'undefined') directDatabaseAccess = false; if (directDatabaseAccess === 'undefined') directDatabaseAccess = false;
if (status !== 'ok') { if (status !== 'ok') {
importFailed(status); importErrorMessage(status);
} else { } else {
$('#import_export').removeClass('popup-show'); $('#import_export').removeClass('popup-show');
} }