X-Git-Url: https://git.p6c8.net/jirafeau/jirafeau.git/blobdiff_plain/249f5f73101449bcda4b4fdcbc549946f0d938c5..refs/merge-requests/39/head:/lib/functions.js.php diff --git a/lib/functions.js.php b/lib/functions.js.php index 3574891..c468d18 100644 --- a/lib/functions.js.php +++ b/lib/functions.js.php @@ -346,11 +346,45 @@ function control_selected_file_size(max_size, error_str) // display options document.getElementById('options').style.display = 'block'; document.getElementById('send').style.display = 'block'; + document.getElementById('send').disabled = false; document.getElementById('error_pop').style.display = 'none'; document.getElementById('send').focus(); } } +// UX-only: script.php enforces disallowed_extensions independently, this +// just warns the user before they submit a doomed upload. +function control_selected_file_extension(disallowed_extensions, error_str) +{ + if (disallowed_extensions.length === 0) + { + return; + } + f_name = document.getElementById('file_select').files[0].name.replace(/[\s.]+$/, '').toLowerCase(); + // suffix match so that compound extensions such as 'tar.gz' work too + if (disallowed_extensions.some(function (ext) { return f_name.endsWith('.' + ext); })) + { + // control_selected_file_size runs first: keep its error, if any, and add ours + var error_pop = document.getElementById('error_pop'); + if (error_pop.style.display === 'none') + { + pop_failure(error_str); + } + else + { + error_pop.innerHTML += '
' + error_str; + } + // keep the button visible but disabled so the user sees it is forbidden + document.getElementById('send').style.display = 'block'; + document.getElementById('send').disabled = true; + document.getElementById('disallowed_extensions').style.display = 'block'; + } + else + { + document.getElementById('disallowed_extensions').style.display = 'none'; + } +} + function XHRErrorHandler(e) { var text = "${e.type}: ${e.loaded} bytes transferred" @@ -430,9 +464,9 @@ function classic_upload (file, time, password, one_time) req.upload.addEventListener ("progress", upload_progress, false); req.addEventListener ("error", XHRErrorHandler, false); req.addEventListener ("abort", XHRErrorHandler, false); - req.onreadystatechange = function () + req.onload = function () { - if (req.readyState == 4 && req.status == 200) + if (req.status === 200) { var res = req.responseText;