From: Dan Brown <redacted>
Date: Sat, 24 Mar 2018 14:54:50 +0000 (+0000)
Subject: Merge branch 'bug/gif-image-740' of git://github.com/Abijeet/BookStack
X-Git-Tag: v0.20.1~1^2~8
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/5ad9c5d3193180075d85b9cfd447da5a21deb85c

Merge branch 'bug/gif-image-740' of git://github.com/Abijeet/BookStack

Also removed console.logs in dropzone.js
---

5ad9c5d3193180075d85b9cfd447da5a21deb85c
diff --cc resources/assets/js/vues/components/dropzone.js
index 65717b86b,3e6e6c730..0e40b20ca
--- a/resources/assets/js/vues/components/dropzone.js
+++ b/resources/assets/js/vues/components/dropzone.js
@@@ -37,14 -35,14 +37,14 @@@ function mounted() 
  
              dz.on('error', function (file, errorMessage, xhr) {
                  _this.$emit('error', {file, errorMessage, xhr});
--                console.log(errorMessage);
--                console.log(xhr);
++
                  function setMessage(message) {
                      $(file.previewElement).find('[data-dz-errormessage]').text(message);
                  }
  
 -                if (xhr.status === 413) setMessage(trans('errors.server_upload_limit'));
 +                if (xhr && xhr.status === 413) setMessage(trans('errors.server_upload_limit'));
-                 if (errorMessage.file) setMessage(errorMessage.file[0]);
+                 else if (errorMessage.file) setMessage(errorMessage.file);
++
              });
          }
     });