Added test to cover export body start/end partial usage

[bookstack] / resources / js / components / dropzone.js

diff --git a/resources/js/components/dropzone.js b/resources/js/components/dropzone.js
index 4b12867aa55b560e0cf68af5503689884ab7000e..44fdf2d0d3fba800e31bf68364088751186428a0 100644 (file)
--- a/resources/js/components/dropzone.js
+++ b/resources/js/components/dropzone.js
@@ -9,13 +9,18 @@ class Dropzone {
     setup() {
         this.container = this.$el;
         this.url = this.$opts.url;
     setup() {
         this.container = this.$el;
         this.url = this.$opts.url;

+        this.successMessage = this.$opts.successMessage;
+        this.removeMessage = this.$opts.removeMessage;
+        this.uploadLimit = Number(this.$opts.uploadLimit);
+        this.uploadLimitMessage = this.$opts.uploadLimitMessage;
+        this.timeoutMessage = this.$opts.timeoutMessage;

 
         const _this = this;
         this.dz = new DropZoneLib(this.container, {
             addRemoveLinks: true,
 
         const _this = this;
         this.dz = new DropZoneLib(this.container, {
             addRemoveLinks: true,

-            dictRemoveFile: window.trans('components.image_upload_remove'),
+            dictRemoveFile: this.removeMessage,

             timeout: Number(window.uploadTimeout) || 60000,
             timeout: Number(window.uploadTimeout) || 60000,

-            maxFilesize: Number(window.uploadLimit) || 256,
+            maxFilesize: this.uploadLimit,

             url: this.url,
             withCredentials: true,
             init() {
             url: this.url,
             withCredentials: true,
             init() {


@@ -32,15 +37,19 @@ class Dropzone {
         const token = window.document.querySelector('meta[name=token]').getAttribute('content');
         data.append('_token', token);
 
         const token = window.document.querySelector('meta[name=token]').getAttribute('content');
         data.append('_token', token);
 

-        xhr.ontimeout = function (e) {
+        xhr.ontimeout = (e) => {

             this.dz.emit('complete', file);
             this.dz.emit('complete', file);

-            this.dz.emit('error', file, window.trans('errors.file_upload_timeout'));
+            this.dz.emit('error', file, this.timeoutMessage);

         }
     }
 
     onSuccess(file, data) {
         }
     }
 
     onSuccess(file, data) {

-        this.container.dispatchEvent(new Event('dropzone'))

         this.$emit('success', {file, data});
         this.$emit('success', {file, data});

+
+        if (this.successMessage) {
+            window.$events.emit('success', this.successMessage);
+        }
+

         fadeOut(file.previewElement, 800, () => {
             this.dz.removeFile(file);
         });
         fadeOut(file.previewElement, 800, () => {
             this.dz.removeFile(file);
         });


@@ -55,7 +64,7 @@ class Dropzone {
         }
 
         if (xhr && xhr.status === 413) {
         }
 
         if (xhr && xhr.status === 413) {

-            setMessage(window.trans('errors.server_upload_limit'))
+            setMessage(this.uploadLimitMessage);

         } else if (errorMessage.file) {
             setMessage(errorMessage.file);
         }
         } else if (errorMessage.file) {
             setMessage(errorMessage.file);
         }