AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve error reporting when file upload is not configured properly

Browse Source
This commit is contained in:
Frederic Guillot
2017-02-12 13:34:56 -05:00
parent a172e3ad8d
commit 991f7426e8
35 changed files with 129 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
assets/js/app.min.js vendored
View File

File diff suppressed because one or more lines are too long

10
assets/js/components/file-upload.js
View File

@@ -19,11 +19,17 @@ KB.component('file-upload', function (containerElement, options) {
KB.find('#file-item-' + currentFileIndex).add(errorElement);
}
function onServerError(response) {
var errorElement = KB.dom('div').addClass('file-error').text(response.message).build();
KB.find('#file-item-' + currentFileIndex).add(errorElement);
KB.trigger('modal.stop');
}
function onComplete() {
currentFileIndex++;
if (currentFileIndex < files.length) {
KB.http.uploadFile(options.url, files[currentFileIndex], onProgress, onComplete, onError);
KB.http.uploadFile(options.url, files[currentFileIndex], onProgress, onComplete, onError, onServerError);
} else {
KB.trigger('modal.stop');
KB.trigger('modal.hide');
@@ -81,7 +87,7 @@ KB.component('file-upload', function (containerElement, options) {
function uploadFiles() {
if (files.length > 0) {
KB.http.uploadFile(options.url, files[currentFileIndex], onProgress, onComplete, onError);
KB.http.uploadFile(options.url, files[currentFileIndex], onProgress, onComplete, onError, onServerError);
}
}

15
assets/js/core/http.js
View File

@@ -83,14 +83,25 @@ KB.http.postForm = function (url, formElement) {
return (new KB.http.request('POST', url, {}, formData)).execute();
};
KB.http.uploadFile = function (url, file, onProgress, onComplete, onError) {
KB.http.uploadFile = function (url, file, onProgress, onComplete, onError, onServerError) {
var fd = new FormData();
fd.append('files[]', file);
var xhr = new XMLHttpRequest();
xhr.upload.addEventListener('progress', onProgress);
xhr.upload.addEventListener('load', onComplete);
xhr.upload.addEventListener('error', onError);
xhr.open('POST', url, true);
xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
xhr.onreadystatechange = function() {
if (xhr.readyState === XMLHttpRequest.DONE) {
if (xhr.status === 200) {
onComplete();
} else if (typeof onServerError !== 'undefined') {
onServerError(JSON.parse(xhr.responseText));
}
}
};
xhr.send(fd);
};