scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-12-16 21:59:00 +08:00
Code Issues Projects Releases Packages Wiki Activity

Move validation before request

Browse source
This commit is contained in:
Urban Rotnik 2020-10-29 08:45:55 +01:00
parent fc8704b520
commit 54f38c8ded
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
app/assets/javascripts/sitewide/tiny_mce_file_upload_plugin.js vendored
View file

@ -15,9 +15,9 @@
function loadFiles() { function loadFiles() {
let $fileInput; let $fileInput;
let hitFileLimit;
$('#tinymce_current_upload').remove(); $('#tinymce_current_upload').remove();
$(editor.container).prepend('<input type="file" multiple accept="image/*" id="tinymce_current_upload" style="display: none;">'); $fileInput = $('<input type="file" multiple accept="image/*" id="tinymce_current_upload" style="display: none;">').prependTo(editor.container);
$fileInput = $('#tinymce_current_upload');
$fileInput.click(); $fileInput.click();
$fileInput.change(function() { $fileInput.change(function() {
@ -25,19 +25,23 @@
let files = $('#tinymce_current_upload')[0].files; let files = $('#tinymce_current_upload')[0].files;
Array.from(files).forEach(file => formData.append('files[]', file, file.name)); Array.from(files).forEach(file => formData.append('files[]', file, file.name));
Array.from(files).every(file => {
if (!validateFileSize(file, true)) {
hitFileLimit = true;
return false;
}
});
if (hitFileLimit) {
return;
}
$.post({ $.post({
url: textAreaElement.data('tinymce-asset-path'), url: textAreaElement.data('tinymce-asset-path'),
data: formData, data: formData,
processData: false, processData: false,
contentType: false, contentType: false,
beforeSend: function(xhr) {
Array.from(files).every(file => {
if (!validateFileSize(file, true)) {
xhr.abort();
return false;
}
});
},
success: function(data) { success: function(data) {
handleResponse(data); handleResponse(data);
$('#tinymce_current_upload').remove(); $('#tinymce_current_upload').remove();