Infra-Mirrors/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-10-01 05:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated DZ upload timeout var name and error handling

Browse Source 
For #1133 & #876
Concerns BookStackApp/website#31
This commit is contained in:
Dan Brown 2018-12-22 15:45:13 +00:00
parent 5fe630b8d2
commit f62843c861
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
resources/assets/js/vues/components/dropzone.js
View File

@ -10,26 +10,27 @@ const props = ['placeholder', 'uploadUrl', 'uploadedTo'];
// TODO - Remove jQuery usage
function mounted() {
let container = this.$el;
let _this = this;
const container = this.$el;
const _this = this;
this._dz = new DropZone(container, {
addRemoveLinks: true,
dictRemoveFile: trans('components.image_upload_remove'),
timeout: +window.dropZoneTimeout || 60000,
timeout: Number(window.uploadTimeout) || 60000,
url: function() {
return _this.uploadUrl;
},
init: function () {
let dz = this;
const dz = this;
dz.on('sending', function (file, xhr, data) {
let token = window.document.querySelector('meta[name=token]').getAttribute('content');
const token = window.document.querySelector('meta[name=token]').getAttribute('content');
data.append('_token', token);
let uploadedTo = typeof _this.uploadedTo === 'undefined' ? 0 : _this.uploadedTo;
const uploadedTo = typeof _this.uploadedTo === 'undefined' ? 0 : _this.uploadedTo;
data.append('uploaded_to', uploadedTo);
xhr.ontimeout = function (e) {
_this.$events.emit('error', trans('errors.file_upload_timeout'));
dz.emit('complete', file);
dz.emit('error', file, trans('errors.file_upload_timeout'));
}
});
@ -47,8 +48,11 @@ function mounted() {
$(file.previewElement).find('[data-dz-errormessage]').text(message);
}
if (xhr && xhr.status === 413) setMessage(trans('errors.server_upload_limit'));
else if (errorMessage.file) setMessage(errorMessage.file);
if (xhr && xhr.status === 413) {
setMessage(trans('errors.server_upload_limit'))
} else if (errorMessage.file) {
setMessage(errorMessage.file);
}
});
}