]> BookStack Code Mirror - bookstack/commitdiff
Merge branch 'bug/gif-image-740' of git://github.com/Abijeet/BookStack
authorDan Brown <redacted>
Sat, 24 Mar 2018 14:54:50 +0000 (14:54 +0000)
committerDan Brown <redacted>
Sat, 24 Mar 2018 14:54:50 +0000 (14:54 +0000)
Also removed console.logs in dropzone.js

1  2 
resources/assets/js/vues/components/dropzone.js

index 65717b86b00f0156b64c607bf293740ac1d62014,3e6e6c73028f52a9e1df898e0027c4b888ae41c9..0e40b20ca17685250a2b486690d2a5e9c70b58d2
@@@ -12,9 -12,7 +12,9 @@@ const props = ['placeholder', 'uploadUr
  function mounted() {
     let container = this.$el;
     let _this = this;
 -   new DropZone(container, {
 +   this._dz = new DropZone(container, {
 +      addRemoveLinks: true,
 +      dictRemoveFile: trans('components.image_upload_remove'),
          url: function() {
              return _this.uploadUrl;
          },
  
              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);
++
              });
          }
     });
  }
  
  function data() {
 -    return {}
 +    return {};
  }
  
 +const methods = {
 +    onClose: function () {
 +        this._dz.removeAllFiles(true);
 +    }
 +};
 +
  module.exports = {
      template,
      props,
      mounted,
      data,
 -};
 +    methods
 +};