active_storage_drag_and_drop 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a079fe553c09b15a8944c7019a74835357838464fecc48c3d2321c8427c9113
-  data.tar.gz: 89fdd70988c3bef9cbd506aff7aff780d4399c58efd930f9c7aa7edbe00d15c5
+  metadata.gz: 9176141cbd109e3763a7f3806afc9276d2cceeed8c0cb7d14de281a33cdbe4d6
+  data.tar.gz: 16cc8d5fa4fe30c4f256ebbf8ff50c6933e8f2aae486f53e4e2ecafa678baead
 SHA512:
-  metadata.gz: 39147a94d61ea43f6f19779b89ca6a740a24d28d11facbc2f377615091be1bc871ae88a840ec70c80be5f3173db47bcf2d8c9fe96f04adbecf1262961a7b3ed6
-  data.tar.gz: 218dfed1043e5d88e1b261d05f5b3a01cc25d241b74f108a30cb00cec45ce8b8db67a43144992fe28b031864a6ac47af0bb3176a5a254a6296cbbf986a61a517
+  metadata.gz: e8898eaa76f675d83bc15af8d2576203e1c1f4ef836ddf4863de0e2859937d0dcb6d65792c0b0bfc6a788308fc6f46b3dcf831cd26b5953456ab2b8332458b10
+  data.tar.gz: 88ce4e6941c66ff2536b012d8bf93026b46325f6340e7c65b82b7d8408f2060ecd3fda431ec968b6f1de7a454899ae6f09494dfd266826aa974a2aa203145bcc

data/.rubocop.yml

@@ -6,6 +6,9 @@ AllCops:
 Rails:
   Enabled: true
 
+Rails/OutputSafety:
+  Enabled: false
+
 Style/Documentation:
   Enabled: false
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    active_storage_drag_and_drop (0.3.2)
+    active_storage_drag_and_drop (0.3.3)
       rails (~> 5.2)
 
 GEM
@@ -60,17 +60,17 @@ GEM
     loofah (2.2.2)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.7.0)
+    mail (2.7.1)
       mini_mime (>= 0.1.1)
     marcel (0.3.2)
       mimemagic (~> 0.3.2)
     method_source (0.9.0)
     mimemagic (0.3.2)
-    mini_mime (1.0.0)
+    mini_mime (1.0.1)
     mini_portile2 (2.3.0)
     minitest (5.11.3)
     nio4r (2.3.1)
-    nokogiri (1.8.4)
+    nokogiri (1.8.5)
       mini_portile2 (~> 2.3.0)
     rack (2.0.5)
     rack-test (1.1.0)

data/README.md

@@ -46,6 +46,15 @@ Call the method `drag_and_drop_file_field` on your model's form:
   = form.submit
 ```
 The first parameter is a symbol representing the method of the ActiveStorage attachment and an optional second parameter sets the the text on the drag and drop zone.
+```ruby
+form.drag_and_drop_file_field :images, 'Drag and drop images here!'
+```
+The content of the dropzone can also be passed as a block of ERB or HAML:
+```haml
+= form.drag_and_drop_file_field :images do
+  %i.far.fa-images
+  Drag images here!
+```
 Options for the nested file field can be passed as key value pairs:
 ```ruby
 form.drag_and_drop_file_field :images, accept: 'image/png, image/jpeg, image/gif, image/tiff'

data/app/assets/javascripts/active_storage_drag_and_drop.js

@@ -104,7 +104,7 @@ return /******/ (function(modules) { // webpackBootstrap
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"DragAndDropUploadController\", function() { return DragAndDropUploadController; });\n/* harmony import */ var _helpers__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./helpers */ \"./app/javascript/active_storage_drag_and_drop/helpers.js\");\n/* harmony import */ var activestorage__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! activestorage */ \"./node_modules/activestorage/app/assets/javascripts/activestorage.js\");\n/* harmony import */ var activestorage__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(activestorage__WEBPACK_IMPORTED_MODULE_1__);\n\n\nconst eventFamily = 'dnd-upload';\n\nclass DragAndDropUploadController {\n  constructor(input, file) {\n    this.input = input;\n    this.form = input.closest('form');\n    this.url = this.input.dataset.directUploadUrl;\n    this.iconContainer = document.getElementById(this.input.dataset.iconContainerId);\n    this.file = file;\n    this.upload = new activestorage__WEBPACK_IMPORTED_MODULE_1__[\"DirectUpload\"](this.file, this.url, this);\n    this.dispatch(\"initialize\");\n  }\n\n  start(callback) {\n    this.upload.create((error, blob) => {\n      if (error) {\n        // Handle the error\n        console.log(\"Upload Error:\");\n        console.log(error);\n        this.dispatchError(error);\n        callback(error);\n      } else {\n        console.log(\"Upload SUCCESS!!\");\n        //      // Add an appropriately-named hidden input to the form with a\n        //      //  value of blob.signed_id so that the blob ids will be\n        //      //  transmitted in the normal upload flow\n        const hiddenField = document.createElement('input');\n        hiddenField.setAttribute(\"type\", \"hidden\");\n        hiddenField.setAttribute(\"value\", blob.signed_id);\n        hiddenField.name = this.input.name;\n        hiddenField.setAttribute('data-direct-upload-id', this.upload.id);\n        this.form.appendChild(hiddenField);\n        this.dispatch(\"end\");\n        callback(error);\n      }\n    });\n  }\n\n  dispatch(name, detail = {}) {\n    detail.file = this.file;\n    detail.id = this.upload.id;\n    detail.iconContainer = this.iconContainer;\n    return Object(_helpers__WEBPACK_IMPORTED_MODULE_0__[\"dispatchEvent\"])(this.input, `${eventFamily}:${name}`, { detail });\n  }\n\n  dispatchError(error) {\n    const event = this.dispatch(\"error\", { error });\n    if (!event.defaultPrevented) {\n      alert(error);\n    }\n  }\n\n  directUploadWillCreateBlobWithXHR(xhr) {\n    this.dispatch(\"before-blob-request\", { xhr });\n  }\n  // directUploadWillStoreFileWithXHR\n  directUploadWillStoreFileWithXHR(xhr) {\n    this.dispatch(\"before-storage-request\", { xhr });\n    xhr.upload.addEventListener(\"progress\", event => this.uploadRequestDidProgress(event));\n  }\n\n  uploadRequestDidProgress(event) {\n    const progress = event.loaded / event.total * 100;\n    if (progress) {\n      this.dispatch(\"progress\", { progress });\n    }\n  }\n\n}\n\n//# sourceURL=webpack://ActiveStorage/./app/javascript/active_storage_drag_and_drop/direct_upload_controller.js?");
+eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"DragAndDropUploadController\", function() { return DragAndDropUploadController; });\n/* harmony import */ var _helpers__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./helpers */ \"./app/javascript/active_storage_drag_and_drop/helpers.js\");\n/* harmony import */ var activestorage__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! activestorage */ \"./node_modules/activestorage/app/assets/javascripts/activestorage.js\");\n/* harmony import */ var activestorage__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(activestorage__WEBPACK_IMPORTED_MODULE_1__);\n\n\nconst eventFamily = 'dnd-upload';\n\nclass DragAndDropUploadController {\n  constructor(input, file) {\n    this.input = input;\n    this.form = input.closest('form');\n    this.url = this.input.dataset.directUploadUrl;\n    this.iconContainer = document.getElementById(this.input.dataset.iconContainerId);\n    this.file = file;\n    this.upload = new activestorage__WEBPACK_IMPORTED_MODULE_1__[\"DirectUpload\"](this.file, this.url, this);\n    this.dispatch(\"initialize\");\n  }\n\n  start(callback) {\n    this.upload.create((error, blob) => {\n      if (error) {\n        // Handle the error\n        this.dispatchError(error);\n        callback(error);\n      } else {\n        //      // Add an appropriately-named hidden input to the form with a\n        //      //  value of blob.signed_id so that the blob ids will be\n        //      //  transmitted in the normal upload flow\n        const hiddenField = document.createElement('input');\n        hiddenField.setAttribute(\"type\", \"hidden\");\n        hiddenField.setAttribute(\"value\", blob.signed_id);\n        hiddenField.name = this.input.name;\n        hiddenField.setAttribute('data-direct-upload-id', this.upload.id);\n        this.form.appendChild(hiddenField);\n        this.dispatch(\"end\");\n        callback(error);\n      }\n    });\n  }\n\n  dispatch(name, detail = {}) {\n    detail.file = this.file;\n    detail.id = this.upload.id;\n    detail.iconContainer = this.iconContainer;\n    return Object(_helpers__WEBPACK_IMPORTED_MODULE_0__[\"dispatchEvent\"])(this.input, `${eventFamily}:${name}`, { detail });\n  }\n\n  dispatchError(error) {\n    const event = this.dispatch(\"error\", { error });\n    if (!event.defaultPrevented) {\n      alert(error);\n    }\n  }\n\n  directUploadWillCreateBlobWithXHR(xhr) {\n    this.dispatch(\"before-blob-request\", { xhr });\n  }\n  // directUploadWillStoreFileWithXHR\n  directUploadWillStoreFileWithXHR(xhr) {\n    this.dispatch(\"before-storage-request\", { xhr });\n    xhr.upload.addEventListener(\"progress\", event => this.uploadRequestDidProgress(event));\n  }\n\n  uploadRequestDidProgress(event) {\n    const progress = event.loaded / event.total * 100;\n    if (progress) {\n      this.dispatch(\"progress\", { progress });\n    }\n  }\n\n}\n\n//# sourceURL=webpack://ActiveStorage/./app/javascript/active_storage_drag_and_drop/direct_upload_controller.js?");
 
 /***/ }),
 
@@ -128,7 +128,7 @@ eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export (binding) *
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var _ujs__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./ujs */ \"./app/javascript/active_storage_drag_and_drop/ujs.js\");\n/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, \"start\", function() { return _ujs__WEBPACK_IMPORTED_MODULE_0__[\"start\"]; });\n\n\n\n\n\nfunction autostart() {\n  Object(_ujs__WEBPACK_IMPORTED_MODULE_0__[\"start\"])();\n}\n\nsetTimeout(autostart, 1);\n\n//----------------------------------------------------------------------------------------------------\n// UI Events - this code is completely outside the draganddrop lib - it's just reacting to events\n//----------------------------------------------------------------------------------------------------\nvar fileUploadUIPainter = function (iconContainer, id, filename, complete) {\n  // the only rule here is that all root level elements must have the data: { direct_upload_id: [id] } attribute ala: 'data-direct-upload-id=\"${id}\"'\n  var cname = complete ? 'complete' : 'pending';\n  var progress = complete ? 100 : 0;\n  iconContainer.insertAdjacentHTML(\"beforeend\", `\n    <div id=\"direct-upload-${id}\" class=\"direct-upload direct-upload--${cname}\" data-direct-upload-id=\"${id}\">\n      <div id=\"direct-upload-progress-${id}\" class=\"direct-upload__progress\" style=\"width: ${progress}%\"></div>\n      <span class=\"direct-upload__filename\">${filename}</span>\n    </div>\n    <a href='remove' class='direct-upload__remove' data-dnd-delete='true' data-direct-upload-id=\"${id}\">x</a>\n  `);\n};\n\naddEventListener(\"dnd-uploads:start\", event => {\n  console.log(\"dnd-uploads:start\");\n});\naddEventListener(\"dnd-uploads:end\", event => {\n  console.log(\"dnd-uploads:end\");\n});\n\naddEventListener(\"dnd-upload:initialize\", event => {\n  console.log(\"dnd-upload:initialize\");\n  const { target, detail } = event;\n  const { id, file, iconContainer } = detail;\n  fileUploadUIPainter(iconContainer, id, file.name, false);\n});\n\naddEventListener(\"dnd-upload:placeholder\", event => {\n  console.log(\"dnd-upload:placeholder\");\n  const { target, detail } = event;\n  const { id, fileName, iconContainer } = detail;\n  fileUploadUIPainter(iconContainer, id, fileName, true);\n});\n\naddEventListener(\"dnd-upload:start\", event => {\n  console.log(\"dnd-upload:start\");\n  const { id } = event.detail;\n  const element = document.getElementById(`direct-upload-${id}`);\n  element.classList.remove(\"direct-upload--pending\");\n});\n\naddEventListener(\"dnd-upload:progress\", event => {\n  console.log(\"dnd-upload:progress\");\n  const { id, progress } = event.detail;\n  const progressElement = document.getElementById(`direct-upload-progress-${id}`);\n  progressElement.style.width = `${progress}%`;\n});\n\naddEventListener(\"dnd-upload:error\", event => {\n  console.log(\"dnd-upload:error\");\n  event.preventDefault();\n  const { id, error } = event.detail;\n  const element = document.getElementById(`direct-upload-${id}`);\n  element.classList.add(\"direct-upload--error\");\n  element.setAttribute(\"title\", error);\n});\n\naddEventListener(\"dnd-upload:end\", event => {\n  console.log(\"dnd-upload:end\");\n  const { id } = event.detail;\n  const element = document.getElementById(`direct-upload-${id}`);\n  element.classList.remove(\"direct-upload--pending\");\n  element.classList.add(\"direct-upload--complete\");\n});\n\n//# sourceURL=webpack://ActiveStorage/./app/javascript/active_storage_drag_and_drop/index.js?");
+eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var _ujs__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./ujs */ \"./app/javascript/active_storage_drag_and_drop/ujs.js\");\n/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, \"start\", function() { return _ujs__WEBPACK_IMPORTED_MODULE_0__[\"start\"]; });\n\n\n\n\n\nfunction autostart() {\n  Object(_ujs__WEBPACK_IMPORTED_MODULE_0__[\"start\"])();\n}\n\nsetTimeout(autostart, 1);\n\n//----------------------------------------------------------------------------------------------------\n// UI Events - this code is completely outside the draganddrop lib - it's just reacting to events\n//----------------------------------------------------------------------------------------------------\nvar fileUploadUIPainter = function (iconContainer, id, filename, complete) {\n  // the only rule here is that all root level elements must have the data: { direct_upload_id: [id] } attribute ala: 'data-direct-upload-id=\"${id}\"'\n  var cname = complete ? 'complete' : 'pending';\n  var progress = complete ? 100 : 0;\n  iconContainer.insertAdjacentHTML(\"beforeend\", `\n    <div id=\"direct-upload-${id}\" class=\"direct-upload direct-upload--${cname}\" data-direct-upload-id=\"${id}\">\n      <div id=\"direct-upload-progress-${id}\" class=\"direct-upload__progress\" style=\"width: ${progress}%\"></div>\n      <span class=\"direct-upload__filename\">${filename}</span>\n    </div>\n    <a href='remove' class='direct-upload__remove' data-dnd-delete='true' data-direct-upload-id=\"${id}\">x</a>\n  `);\n};\n\n// addEventListener(\"dnd-uploads:start\", event => {\n// })\n// addEventListener(\"dnd-uploads:end\", event => {\n// })\n\naddEventListener(\"dnd-upload:initialize\", event => {\n  if (!event.defaultPrevented) {\n    const { target, detail } = event;\n    const { id, file, iconContainer } = detail;\n    fileUploadUIPainter(iconContainer, id, file.name, false);\n  }\n});\n\naddEventListener(\"dnd-upload:placeholder\", event => {\n  if (!event.defaultPrevented) {\n    const { target, detail } = event;\n    const { id, fileName, iconContainer } = detail;\n    fileUploadUIPainter(iconContainer, id, fileName, true);\n  }\n});\n\naddEventListener(\"dnd-upload:start\", event => {\n  if (!event.defaultPrevented) {\n    const { id } = event.detail;\n    const element = document.getElementById(`direct-upload-${id}`);\n    element.classList.remove(\"direct-upload--pending\");\n  }\n});\n\naddEventListener(\"dnd-upload:progress\", event => {\n  if (!event.defaultPrevented) {\n    const { id, progress } = event.detail;\n    const progressElement = document.getElementById(`direct-upload-progress-${id}`);\n    progressElement.style.width = `${progress}%`;\n  }\n});\n\naddEventListener(\"dnd-upload:error\", event => {\n  if (!event.defaultPrevented) {\n    event.preventDefault();\n    const { id, error } = event.detail;\n    const element = document.getElementById(`direct-upload-${id}`);\n    element.classList.add(\"direct-upload--error\");\n    element.setAttribute(\"title\", error);\n  }\n});\n\naddEventListener(\"dnd-upload:end\", event => {\n  if (!event.defaultPrevented) {\n    const { id } = event.detail;\n    const element = document.getElementById(`direct-upload-${id}`);\n    element.classList.remove(\"direct-upload--pending\");\n    element.classList.add(\"direct-upload--complete\");\n  }\n});\n\n//# sourceURL=webpack://ActiveStorage/./app/javascript/active_storage_drag_and_drop/index.js?");
 
 /***/ }),
 
@@ -140,7 +140,7 @@ eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var _ujs
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"start\", function() { return start; });\n/* harmony import */ var _upload_queue_processor__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./upload_queue_processor */ \"./app/javascript/active_storage_drag_and_drop/upload_queue_processor.js\");\n/* harmony import */ var _helpers__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./helpers */ \"./app/javascript/active_storage_drag_and_drop/helpers.js\");\n\n\n\nlet started = false;\nlet formSubmitted = false;\n\nfunction didSubmitForm(event) {\n  handleFormSubmissionEvent(event);\n}\n\nfunction didSubmitRemoteElement(event) {\n  if (event.target.tagName == \"FORM\") {\n    handleFormSubmissionEvent(event);\n  }\n}\n\nfunction handleFormSubmissionEvent(event) {\n  if (formSubmitted) {\n    return;\n  }\n  formSubmitted = true;\n  const form = event.target;\n  const next_upload = new _upload_queue_processor__WEBPACK_IMPORTED_MODULE_0__[\"UploadQueueProcessor\"](form);\n  // if the upload processor has no dnd file inputs, then we let the event happen naturally\n  // if it DOES have dnd file inputs, then we have to process our queue first and then submit the form\n  if (next_upload.current_uploaders.length > 0) {\n    event.preventDefault();\n    // inputs.forEach(disable)\n    next_upload.start(error => {\n      if (error) {\n        // inputs.forEach(enable)\n      } else {\n        form.submit();\n        // The original ActiveStorage DirectUpload system did this action using\n        // input.click(), but doing that either makes the form submission event\n        // happen multiple times, or the browser seems to block the input.click()\n        // event completely, because it's not a trusted 'as a result of a mouse\n        // click' event.\n        // HOWEVER\n        // form.submit() doesn't trigger to any UJS submission events. This\n        // results in remote forms being submitted locally whenever there's a\n        // dnd file to upload.  Instead we use Rails.fire(element, 'submit')\n        // Rails.fire(form, 'submit')\n      }\n    });\n  }\n}\n\nfunction addAttachedFileIcons() {\n  console.log('checking for already attached files');\n  document.querySelectorAll(\"input[type='hidden'][data-direct-upload-id][data-uploaded-file-name]\").forEach(uploadedFile => {\n    console.log('addAttachedFileIcon!');\n    const dataset = uploadedFile.dataset;\n    let iconContainer = document.getElementById(dataset.iconContainerId);\n    let detail = {\n      id: dataset.directUploadId,\n      fileName: dataset.uploadedFileName,\n      iconContainer: iconContainer\n    };\n    _helpers__WEBPACK_IMPORTED_MODULE_1__[\"dispatchEvent\"](uploadedFile, `dnd-upload:placeholder`, { detail });\n  });\n}\n\nfunction start() {\n  if (started) {\n    return;\n  }\n  started = true;\n  document.addEventListener(\"submit\", didSubmitForm);\n  document.addEventListener(\"ajax:before\", didSubmitRemoteElement);\n\n  // input[type=file][data-dnd=true]\n  document.addEventListener(\"change\", event => {\n    console.log('document:change');\n    if (event.target.type == 'file' && event.target.dataset.dnd == 'true') {\n      const input = event.target;\n      console.log(\"input[type=file][data-dnd=true]:change\");\n      Array.from(input.files).forEach(file => Object(_upload_queue_processor__WEBPACK_IMPORTED_MODULE_0__[\"createUploader\"])(input, file));\n      input.value = null;\n    }\n  });\n  document.addEventListener(\"dragover\", event => {\n    console.log('document:dragover');\n    if (_helpers__WEBPACK_IMPORTED_MODULE_1__[\"hasClassnameInHeirarchy\"](event.target, 'asdndzone')) {\n      event.preventDefault();\n    }\n  });\n  document.addEventListener(\"drop\", event => {\n    console.log('document:drop');\n    let asdndz = _helpers__WEBPACK_IMPORTED_MODULE_1__[\"getClassnameFromHeirarchy\"](event.target, 'asdndzone');\n    if (asdndz) {\n      event.preventDefault();\n      console.log(\".asdndzone:drop\");\n      // get the input associated with this dndz\n      const input = document.getElementById(asdndz.dataset.dndInputId);\n      Array.from(event.dataTransfer.files).forEach(file => Object(_upload_queue_processor__WEBPACK_IMPORTED_MODULE_0__[\"createUploader\"])(input, file));\n    }\n  });\n  document.addEventListener(\"click\", event => {\n    if (event.target.dataset.dndDelete == 'true' && event.target.hasAttribute('data-direct-upload-id')) {\n      event.preventDefault();\n      console.log(\"[data-dnd-delete=true][data-direct-upload-id]:click\");\n      document.querySelectorAll('[data-direct-upload-id=\"' + event.target.dataset.directUploadId + '\"]').forEach(element => {\n        element.remove();\n      });\n      for (var i = 0; i < _upload_queue_processor__WEBPACK_IMPORTED_MODULE_0__[\"uploaders\"].length; i++) {\n        if (_upload_queue_processor__WEBPACK_IMPORTED_MODULE_0__[\"uploaders\"][i].upload.id == event.target.dataset.directUploadId) {\n          _upload_queue_processor__WEBPACK_IMPORTED_MODULE_0__[\"uploaders\"].splice(i, 1);\n          break;\n        }\n      }\n    }\n  });\n  addEventListener(\"turbolinks:load\", addAttachedFileIcons);\n  addEventListener(\"load\", addAttachedFileIcons);\n}\n\n//# sourceURL=webpack://ActiveStorage/./app/javascript/active_storage_drag_and_drop/ujs.js?");
+eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"start\", function() { return start; });\n/* harmony import */ var _upload_queue_processor__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./upload_queue_processor */ \"./app/javascript/active_storage_drag_and_drop/upload_queue_processor.js\");\n/* harmony import */ var _helpers__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./helpers */ \"./app/javascript/active_storage_drag_and_drop/helpers.js\");\n\n\n\nlet started = false;\nlet formSubmitted = false;\n\nfunction didSubmitForm(event) {\n  handleFormSubmissionEvent(event);\n}\n\nfunction didSubmitRemoteElement(event) {\n  if (event.target.tagName == \"FORM\") {\n    handleFormSubmissionEvent(event);\n  }\n}\n\nfunction handleFormSubmissionEvent(event) {\n  if (formSubmitted) {\n    return;\n  }\n  formSubmitted = true;\n  const form = event.target;\n  const next_upload = new _upload_queue_processor__WEBPACK_IMPORTED_MODULE_0__[\"UploadQueueProcessor\"](form);\n  // if the upload processor has no dnd file inputs, then we let the event happen naturally\n  // if it DOES have dnd file inputs, then we have to process our queue first and then submit the form\n  if (next_upload.current_uploaders.length > 0) {\n    event.preventDefault();\n    // inputs.forEach(disable)\n    next_upload.start(error => {\n      if (error) {\n        // inputs.forEach(enable)\n      } else {\n        form.submit();\n        // The original ActiveStorage DirectUpload system did this action using\n        // input.click(), but doing that either makes the form submission event\n        // happen multiple times, or the browser seems to block the input.click()\n        // event completely, because it's not a trusted 'as a result of a mouse\n        // click' event.\n        // HOWEVER\n        // form.submit() doesn't trigger to any UJS submission events. This\n        // results in remote forms being submitted locally whenever there's a\n        // dnd file to upload.  Instead we use Rails.fire(element, 'submit')\n        // Rails.fire(form, 'submit')\n      }\n    });\n  }\n}\n\nfunction addAttachedFileIcons() {\n  document.querySelectorAll(\"input[type='hidden'][data-direct-upload-id][data-uploaded-file-name]\").forEach(uploadedFile => {\n    const dataset = uploadedFile.dataset;\n    let iconContainer = document.getElementById(dataset.iconContainerId);\n    let detail = {\n      id: dataset.directUploadId,\n      fileName: dataset.uploadedFileName,\n      iconContainer: iconContainer\n    };\n    _helpers__WEBPACK_IMPORTED_MODULE_1__[\"dispatchEvent\"](uploadedFile, `dnd-upload:placeholder`, { detail });\n  });\n}\n\nfunction start() {\n  if (started) {\n    return;\n  }\n  started = true;\n  document.addEventListener(\"submit\", didSubmitForm);\n  document.addEventListener(\"ajax:before\", didSubmitRemoteElement);\n\n  // input[type=file][data-dnd=true]\n  document.addEventListener(\"change\", event => {\n    if (event.target.type == 'file' && event.target.dataset.dnd == 'true') {\n      const input = event.target;\n      Array.from(input.files).forEach(file => Object(_upload_queue_processor__WEBPACK_IMPORTED_MODULE_0__[\"createUploader\"])(input, file));\n      input.value = null;\n    }\n  });\n  document.addEventListener(\"dragover\", event => {\n    if (_helpers__WEBPACK_IMPORTED_MODULE_1__[\"hasClassnameInHeirarchy\"](event.target, 'asdndzone')) {\n      event.preventDefault();\n    }\n  });\n  document.addEventListener(\"drop\", event => {\n    let asdndz = _helpers__WEBPACK_IMPORTED_MODULE_1__[\"getClassnameFromHeirarchy\"](event.target, 'asdndzone');\n    if (asdndz) {\n      event.preventDefault();\n      // get the input associated with this dndz\n      const input = document.getElementById(asdndz.dataset.dndInputId);\n      Array.from(event.dataTransfer.files).forEach(file => Object(_upload_queue_processor__WEBPACK_IMPORTED_MODULE_0__[\"createUploader\"])(input, file));\n    }\n  });\n  document.addEventListener(\"click\", event => {\n    if (event.target.dataset.dndDelete == 'true' && event.target.hasAttribute('data-direct-upload-id')) {\n      event.preventDefault();\n      document.querySelectorAll('[data-direct-upload-id=\"' + event.target.dataset.directUploadId + '\"]').forEach(element => {\n        element.remove();\n      });\n      for (var i = 0; i < _upload_queue_processor__WEBPACK_IMPORTED_MODULE_0__[\"uploaders\"].length; i++) {\n        if (_upload_queue_processor__WEBPACK_IMPORTED_MODULE_0__[\"uploaders\"][i].upload.id == event.target.dataset.directUploadId) {\n          _upload_queue_processor__WEBPACK_IMPORTED_MODULE_0__[\"uploaders\"].splice(i, 1);\n          break;\n        }\n      }\n    }\n  });\n  addEventListener(\"turbolinks:load\", addAttachedFileIcons);\n  addEventListener(\"load\", addAttachedFileIcons);\n}\n\n//# sourceURL=webpack://ActiveStorage/./app/javascript/active_storage_drag_and_drop/ujs.js?");
 
 /***/ }),
 

data/app/assets/stylesheets/direct_uploads.css

@@ -1,5 +1,5 @@
 /* direct_uploads.css */
- 
+
 .direct-upload {
   display: inline-block;
   position: relative;
@@ -10,11 +10,11 @@
   font-size: 11px;
   line-height: 13px;
 }
- 
+
 .direct-upload--pending {
   opacity: 0.6;
 }
- 
+
 .direct-upload__progress {
   position: absolute;
   top: 0;
@@ -25,18 +25,19 @@
   transition: width 120ms ease-out, opacity 60ms 60ms ease-in;
   transform: translate3d(0, 0, 0);
 }
- 
+
 .direct-upload--complete .direct-upload__progress {
   opacity: 0.4;
 }
- 
+
 .direct-upload--error {
   border-color: red;
 }
+
 .direct-upload__remove {
   font-size: 0.5em;
 }
- 
+
 input[type=file][data-direct-upload-url][disabled] {
   display: none;
 }

data/app/javascript/active_storage_drag_and_drop/direct_upload_controller.js

@@ -17,12 +17,9 @@ export class DragAndDropUploadController {
     this.upload.create((error, blob) => {
       if (error) {
         // Handle the error
-        console.log("Upload Error:");
-        console.log(error);
         this.dispatchError(error)
         callback(error)
       } else {
-        console.log("Upload SUCCESS!!");
 //      // Add an appropriately-named hidden input to the form with a
 //      //  value of blob.signed_id so that the blob ids will be
 //      //  transmitted in the normal upload flow

data/app/javascript/active_storage_drag_and_drop/index.js

@@ -24,54 +24,58 @@ var fileUploadUIPainter = function(iconContainer, id, filename, complete) {
   `)
 }
 
-addEventListener("dnd-uploads:start", event => {
-  console.log("dnd-uploads:start")
-})
-addEventListener("dnd-uploads:end", event => {
-  console.log("dnd-uploads:end")
-})
+// addEventListener("dnd-uploads:start", event => {
+// })
+// addEventListener("dnd-uploads:end", event => {
+// })
 
 addEventListener("dnd-upload:initialize", event => {
-  console.log("dnd-upload:initialize")
-  const { target, detail } = event
-  const { id, file, iconContainer } = detail
-  fileUploadUIPainter(iconContainer, id, file.name, false)
+  if (!event.defaultPrevented) {
+    const { target, detail } = event
+    const { id, file, iconContainer } = detail
+    fileUploadUIPainter(iconContainer, id, file.name, false)
+  }
 })
 
 addEventListener("dnd-upload:placeholder", event => {
-  console.log("dnd-upload:placeholder")
-  const { target, detail } = event
-  const { id, fileName, iconContainer } = detail
-  fileUploadUIPainter(iconContainer, id, fileName, true)
+  if (!event.defaultPrevented) {
+    const { target, detail } = event
+    const { id, fileName, iconContainer } = detail
+    fileUploadUIPainter(iconContainer, id, fileName, true)
+  }
 })
 
 addEventListener("dnd-upload:start", event => {
-  console.log("dnd-upload:start")
-  const { id } = event.detail
-  const element = document.getElementById(`direct-upload-${id}`)
-  element.classList.remove("direct-upload--pending")
+  if (!event.defaultPrevented) {
+    const { id } = event.detail
+    const element = document.getElementById(`direct-upload-${id}`)
+    element.classList.remove("direct-upload--pending")
+  }
 })
 
 addEventListener("dnd-upload:progress", event => {
-  console.log("dnd-upload:progress")
-  const { id, progress } = event.detail
-  const progressElement = document.getElementById(`direct-upload-progress-${id}`)
-  progressElement.style.width = `${progress}%`
+  if (!event.defaultPrevented) {
+    const { id, progress } = event.detail
+    const progressElement = document.getElementById(`direct-upload-progress-${id}`)
+    progressElement.style.width = `${progress}%`
+  }
 })
 
 addEventListener("dnd-upload:error", event => {
-  console.log("dnd-upload:error")
-  event.preventDefault()
-  const { id, error } = event.detail
-  const element = document.getElementById(`direct-upload-${id}`)
-  element.classList.add("direct-upload--error")
-  element.setAttribute("title", error)
+  if (!event.defaultPrevented) {
+    event.preventDefault()
+    const { id, error } = event.detail
+    const element = document.getElementById(`direct-upload-${id}`)
+    element.classList.add("direct-upload--error")
+    element.setAttribute("title", error)
+  }
 })
 
 addEventListener("dnd-upload:end", event => {
-  console.log("dnd-upload:end")
-  const { id } = event.detail
-  const element = document.getElementById(`direct-upload-${id}`)
-  element.classList.remove("direct-upload--pending")
-  element.classList.add("direct-upload--complete")
+  if (!event.defaultPrevented) {
+    const { id } = event.detail
+    const element = document.getElementById(`direct-upload-${id}`)
+    element.classList.remove("direct-upload--pending")
+    element.classList.add("direct-upload--complete")
+  }
 })

data/app/javascript/active_storage_drag_and_drop/ujs.js

@@ -45,9 +45,7 @@ function handleFormSubmissionEvent(event) {
 }
 
 function addAttachedFileIcons() {
-  console.log('checking for already attached files')
   document.querySelectorAll("input[type='hidden'][data-direct-upload-id][data-uploaded-file-name]").forEach( uploadedFile => {
-    console.log('addAttachedFileIcon!')
     const dataset = uploadedFile.dataset
     let iconContainer = document.getElementById(dataset.iconContainerId);
     let detail = {
@@ -67,26 +65,21 @@ export function start() {
 
   // input[type=file][data-dnd=true]
   document.addEventListener("change", event => {
-    console.log('document:change')
     if(event.target.type == 'file' && event.target.dataset.dnd == 'true') {
       const input = event.target;
-      console.log("input[type=file][data-dnd=true]:change")
       Array.from(input.files).forEach(file => createUploader(input, file))
       input.value = null
     }
   })
   document.addEventListener("dragover", event => {
-    console.log('document:dragover');
     if(helpers.hasClassnameInHeirarchy(event.target, 'asdndzone')) {
       event.preventDefault();
     }
   })
   document.addEventListener("drop", event => {
-    console.log('document:drop');
     let asdndz = helpers.getClassnameFromHeirarchy(event.target, 'asdndzone')
     if(asdndz) {
       event.preventDefault()
-      console.log(".asdndzone:drop")
       // get the input associated with this dndz
       const input = document.getElementById(asdndz.dataset.dndInputId)
       Array.from(event.dataTransfer.files).forEach(file => createUploader(input, file))
@@ -95,7 +88,6 @@ export function start() {
   document.addEventListener("click", event => {
     if( event.target.dataset.dndDelete == 'true' && event.target.hasAttribute('data-direct-upload-id') ) {
       event.preventDefault();
-      console.log("[data-dnd-delete=true][data-direct-upload-id]:click")
       document.querySelectorAll('[data-direct-upload-id="'+event.target.dataset.directUploadId+'"]').forEach(element => {
         element.remove()
       })

data/lib/active_storage_drag_and_drop/rails/form_builder.rb

@@ -2,22 +2,57 @@ module ActiveStorageDragAndDrop
   module Rails
     module FormBuilder
       include ActionView::Helpers::TagHelper
+      include Haml::Helpers if defined? Haml
 
-      def drag_and_drop_file_field(method, tag_value = nil, **options)
-        tag_value ||= tag.strong('Drag and drop') + ' files here or ' +
-                      tag.strong('click to browse')
+      def drag_and_drop_file_field(method, content_or_options = nil, options = {}, &block)
+        if block_given?
+          options = content_or_options if content_or_options.is_a? Hash
+          drag_and_drop_file_field_string(method, capture(&block), options)
+        else
+          drag_and_drop_file_field_string(method, content_or_options, options)
+        end
+      end
+
+      private
+
+      def capture_haml(*args, &block)
+        with_haml_buffer(load_buffer(block)) do
+          position = haml_buffer.buffer.length
+
+          haml_buffer.capture_position = position
+          value = yield(*args)
+          captured = haml_buffer.buffer.slice!(position..-1)
+          capture_value(captured, value)
+        end
+      end
+
+      def capture_value(captured, value)
+        if (captured == '') && (value != haml_buffer.buffer)
+          captured = (value.is_a?(String) ? value : nil)
+        end
+        captured.html_safe
+      end
+
+      def load_buffer(block)
+        buffer = eval <<-RUBY, block.binding, __FILE__, __LINE__ + 1
+          (defined? _hamlout) ? _hamlout : nil
+        RUBY
+        buffer || haml_buffer
+      end
+
+      def drag_and_drop_file_field_string(method, content = nil, options = {})
+        content ||= tag.strong('Drag and drop') + ' files here or ' +
+                    tag.strong('click to browse')
         @template.render partial: 'active_storage_drag_and_drop',
                          locals: {
-                           tag_value: tag_value,
+                           tag_value: content,
                            form: self,
                            attachments: @object.send(method),
                            method: method,
-                           options: file_field_options(options, method)
+                           options: file_field_options(method, options)
                          }
       end
 
-      private
-
       def default_file_field_options(method)
         {
           multiple: true,
@@ -31,7 +66,7 @@ module ActiveStorageDragAndDrop
         }
       end
 
-      def file_field_options(custom_options, method)
+      def file_field_options(method, custom_options)
         default_file_field_options(method).merge(custom_options) do |_key, default, custom|
           default.is_a?(Hash) && custom.is_a?(Hash) ? default.merge(custom) : custom
         end

data/lib/active_storage_drag_and_drop/version.rb

@@ -1,3 +1,3 @@
 module ActiveStorageDragAndDrop
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end

data/yarn.lock

@@ -139,12 +139,13 @@
     long "^3.2.0"
 
 "@webpack-contrib/config-loader@^1.0.0":
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/@webpack-contrib/config-loader/-/config-loader-1.1.3.tgz#6cce904cabfd880203db600207fdbf64f4744fd7"
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@webpack-contrib/config-loader/-/config-loader-1.2.1.tgz#5b3dd474e207437939d294d200c68b7b00008e04"
   dependencies:
     "@webpack-contrib/schema-utils" "^1.0.0-beta.0"
     chalk "^2.1.0"
     cosmiconfig "^5.0.2"
+    is-plain-obj "^1.1.0"
     loud-rejection "^1.6.0"
     merge-options "^1.0.1"
     minimist "^1.2.0"
@@ -187,13 +188,13 @@ ajv-keywords@^3.1.0:
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a"
 
 ajv@^6.1.0:
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.1.tgz#88ebc1263c7133937d108b80c5572e64e1d9322d"
+  version "6.5.5"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.5.tgz#cf97cdade71c6399a92c6d6c4177381291b781a1"
   dependencies:
     fast-deep-equal "^2.0.1"
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.4.1"
-    uri-js "^4.2.1"
+    uri-js "^4.2.2"
 
 ansi-align@^2.0.0:
   version "2.0.0"
@@ -948,6 +949,22 @@ cache-base@^1.0.1:
     union-value "^1.0.0"
     unset-value "^1.0.0"
 
+caller-callsite@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134"
+  dependencies:
+    callsites "^2.0.0"
+
+caller-path@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4"
+  dependencies:
+    caller-callsite "^2.0.0"
+
+callsites@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
+
 camelcase-keys@^4.0.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-4.2.0.tgz#a2aa5fb1af688758259c32c141426d78923b9b77"
@@ -969,8 +986,8 @@ caniuse-lite@^1.0.30000844:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000858.tgz#f6f203a9128bac507136de1cf6cfd966d2df027c"
 
 capture-stack-trace@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz#4a6fa07399c26bba47f0b2496b4d0fb408c5550d"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz#a6c0bbe1f38f3aa0b92238ecb6ff42c344d4135d"
 
 chalk@^1.1.3:
   version "1.1.3"
@@ -1019,9 +1036,9 @@ chrome-trace-event@^1.0.0:
   dependencies:
     tslib "^1.9.0"
 
-ci-info@^1.0.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.1.3.tgz#710193264bb05c77b8c90d02f5aaf22216a667b2"
+ci-info@^1.5.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz#2ca20dbb9ceb32d4524a683303313f0304b1e497"
 
 cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
   version "1.0.4"
@@ -1069,14 +1086,14 @@ collection-visit@^1.0.0:
     object-visit "^1.0.0"
 
 color-convert@^1.9.0:
-  version "1.9.2"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.2.tgz#49881b8fba67df12a96bdf3f56c0aab9e7913147"
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
   dependencies:
-    color-name "1.1.1"
+    color-name "1.1.3"
 
-color-name@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.1.tgz#4b1415304cf50028ea81643643bd82ea05803689"
+color-name@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
 
 commander@~2.13.0:
   version "2.13.0"
@@ -1156,9 +1173,10 @@ core-util-is@~1.0.0:
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
 
 cosmiconfig@^5.0.2:
-  version "5.0.5"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.5.tgz#a809e3c2306891ce17ab70359dc8bdf661fe2cd0"
+  version "5.0.7"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.7.tgz#39826b292ee0d78eda137dfa3173bd1c21a43b04"
   dependencies:
+    import-fresh "^2.0.0"
     is-directory "^0.3.1"
     js-yaml "^3.9.0"
     parse-json "^4.0.0"
@@ -1237,7 +1255,7 @@ cyclist@~0.2.2:
 
 d@1:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f"
+  resolved "http://registry.npmjs.org/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f"
   dependencies:
     es5-ext "^0.10.9"
 
@@ -1252,10 +1270,10 @@ debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
     ms "2.0.0"
 
 debug@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  version "3.2.6"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
   dependencies:
-    ms "2.0.0"
+    ms "^2.1.1"
 
 decamelize-keys@^1.0.0:
   version "1.1.0"
@@ -1289,11 +1307,10 @@ defaults@^1.0.3:
     clone "^1.0.2"
 
 define-properties@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.2.tgz#83a73f2fea569898fb737193c8f873caf6d45c94"
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
   dependencies:
-    foreach "^2.0.5"
-    object-keys "^1.0.8"
+    object-keys "^1.0.12"
 
 define-property@^0.2.5:
   version "0.2.5"
@@ -1393,8 +1410,8 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0:
     once "^1.4.0"
 
 enhanced-resolve@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.0.0.tgz#e34a6eaa790f62fccd71d93959f56b2b432db10a"
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz#41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f"
   dependencies:
     graceful-fs "^4.1.2"
     memory-fs "^0.4.0"
@@ -1423,16 +1440,16 @@ es-abstract@^1.6.1:
     is-regex "^1.0.4"
 
 es-to-primitive@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.1.1.tgz#45355248a88979034b6792e19bb81f2b7975dd0d"
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377"
   dependencies:
-    is-callable "^1.1.1"
+    is-callable "^1.1.4"
     is-date-object "^1.0.1"
-    is-symbol "^1.0.1"
+    is-symbol "^1.0.2"
 
 es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
-  version "0.10.45"
-  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.45.tgz#0bfdf7b473da5919d5adf3bd25ceb754fccc3653"
+  version "0.10.46"
+  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.46.tgz#efd99f67c5a7ec789baa3daa7f79870388f7f572"
   dependencies:
     es6-iterator "~2.0.3"
     es6-symbol "~3.1.1"
@@ -1465,8 +1482,8 @@ eslint-scope@^3.7.1:
     estraverse "^4.1.1"
 
 esprima@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
 
 esrecurse@^4.1.0:
   version "4.2.1"
@@ -1585,10 +1602,6 @@ for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
 
-foreach@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
-
 fragment-cache@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
@@ -1647,7 +1660,7 @@ gauge@~2.7.3:
 
 get-stream@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
+  resolved "http://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
 
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
@@ -1683,7 +1696,7 @@ globals@^9.18.0:
 
 got@^6.7.1:
   version "6.7.1"
-  resolved "https://registry.yarnpkg.com/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0"
+  resolved "http://registry.npmjs.org/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0"
   dependencies:
     create-error-class "^3.0.0"
     duplexer3 "^0.1.4"
@@ -1698,8 +1711,8 @@ got@^6.7.1:
     url-parse-lax "^1.0.0"
 
 graceful-fs@^4.1.11, graceful-fs@^4.1.2:
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
+  version "4.1.15"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
 
 has-ansi@^2.0.0:
   version "2.0.0"
@@ -1782,8 +1795,8 @@ home-or-tmp@^2.0.0:
     os-tmpdir "^1.0.1"
 
 hosted-git-info@^2.1.4:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.6.0.tgz#23235b29ab230c576aab0d4f13fc046b0b038222"
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047"
 
 https-browserify@^1.0.0:
   version "1.0.0"
@@ -1809,6 +1822,13 @@ ignore-walk@^3.0.1:
   dependencies:
     minimatch "^3.0.4"
 
+import-fresh@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz#d81355c15612d386c61f9ddd3922d4304822a546"
+  dependencies:
+    caller-path "^2.0.0"
+    resolve-from "^3.0.0"
+
 import-lazy@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"
@@ -1889,19 +1909,19 @@ is-buffer@^1.1.5:
 
 is-builtin-module@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
+  resolved "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
   dependencies:
     builtin-modules "^1.0.0"
 
-is-callable@^1.1.1, is-callable@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.3.tgz#86eb75392805ddc33af71c92a0eedf74ee7604b2"
+is-callable@^1.1.3, is-callable@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
 
 is-ci@^1.0.10:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.1.0.tgz#247e4162e7860cebbdaf30b774d6b0ac7dcfe7a5"
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz#e3779c8ee17fccf428488f6e281187f2e632841c"
   dependencies:
-    ci-info "^1.0.0"
+    ci-info "^1.5.0"
 
 is-data-descriptor@^0.1.4:
   version "0.1.4"
@@ -2004,7 +2024,7 @@ is-number@^4.0.0:
 
 is-obj@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
+  resolved "http://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
 
 is-odd@^2.0.0:
   version "2.0.0"
@@ -2046,9 +2066,11 @@ is-stream@^1.0.0, is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
 
-is-symbol@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.1.tgz#3cc59f00025194b6ab2e38dbae6689256b660572"
+is-symbol@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz#a055f6ae57192caee329e7a860118b497a950f38"
+  dependencies:
+    has-symbols "^1.0.0"
 
 is-windows@^1.0.2:
   version "1.0.2"
@@ -2336,7 +2358,7 @@ minimist@0.0.8:
 
 minimist@^1.2.0:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+  resolved "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
 
 minipass@^2.2.1, minipass@^2.3.3:
   version "2.3.3"
@@ -2394,6 +2416,10 @@ ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
 
+ms@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
+
 nan@^2.9.2:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
@@ -2429,7 +2455,7 @@ neo-async@^2.5.0:
 
 next-tick@1:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
+  resolved "http://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
 
 node-libs-browser@^2.0.0:
   version "2.1.0"
@@ -2538,7 +2564,7 @@ object-copy@^0.1.0:
     define-property "^0.2.5"
     kind-of "^3.0.3"
 
-object-keys@^1.0.11, object-keys@^1.0.8:
+object-keys@^1.0.11, object-keys@^1.0.12:
   version "1.0.12"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.12.tgz#09c53855377575310cca62f55bb334abff7b3ed2"
 
@@ -2585,8 +2611,8 @@ onetime@^2.0.0:
     mimic-fn "^1.0.0"
 
 opn@^5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/opn/-/opn-5.3.0.tgz#64871565c863875f052cfdf53d3e3cb5adb53b1c"
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/opn/-/opn-5.4.0.tgz#cb545e7aab78562beb11aa3bfabc7042e1761035"
   dependencies:
     is-wsl "^1.1.0"
 
@@ -2707,8 +2733,8 @@ path-key@^2.0.0:
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
 
 path-parse@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
 
 path-type@^3.0.0:
   version "3.0.0"
@@ -3045,7 +3071,11 @@ semver-diff@^2.0.0:
   dependencies:
     semver "^5.0.3"
 
-"semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.1.0, semver@^5.3.0:
+"semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.1.0:
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
+
+semver@^5.3.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
 
@@ -3172,15 +3202,15 @@ spark-md5@^3.0.0:
   resolved "https://registry.yarnpkg.com/spark-md5/-/spark-md5-3.0.0.tgz#3722227c54e2faf24b1dc6d933cc144e6f71bfef"
 
 spdx-correct@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.0.0.tgz#05a5b4d7153a195bc92c3c425b69f3b2a9524c82"
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.0.2.tgz#19bb409e91b47b1ad54159243f7312a858db3c2e"
   dependencies:
     spdx-expression-parse "^3.0.0"
     spdx-license-ids "^3.0.0"
 
 spdx-exceptions@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz#2c7ae61056c714a5b9b9b2b2af7d311ef5c78fe9"
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz#2ea450aee74f2a89bfb94519c07fcd6f41322977"
 
 spdx-expression-parse@^3.0.0:
   version "3.0.0"
@@ -3190,8 +3220,8 @@ spdx-expression-parse@^3.0.0:
     spdx-license-ids "^3.0.0"
 
 spdx-license-ids@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz#7a7cd28470cc6d3a1cfe6d66886f6bc430d3ac87"
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.2.tgz#a59efc09784c2a5bada13cfeaf5c75dd214044d2"
 
 split-string@^3.0.1, split-string@^3.0.2:
   version "3.1.0"
@@ -3283,7 +3313,7 @@ strip-bom@^3.0.0:
 
 strip-eof@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
+  resolved "http://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
 
 strip-indent@^2.0.0:
   version "2.0.0"
@@ -3298,14 +3328,14 @@ supports-color@^2.0.0:
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
 
 supports-color@^5.3.0:
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54"
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
   dependencies:
     has-flag "^3.0.0"
 
 tapable@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.0.0.tgz#cbb639d9002eed9c6b5975eb20598d7936f1f9f2"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.0.tgz#0d076a172e3d9ba088fd2272b2668fb8d194b78c"
 
 tar@^4:
   version "4.4.4"
@@ -3477,7 +3507,7 @@ update-notifier@^2.3.0:
     semver-diff "^2.0.0"
     xdg-basedir "^3.0.0"
 
-uri-js@^4.2.1:
+uri-js@^4.2.2:
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
   dependencies:
@@ -3523,16 +3553,16 @@ util@^0.10.3:
     inherits "2.0.3"
 
 uuid@^3.1.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14"
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
 
 v8-compile-cache@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.0.tgz#526492e35fc616864284700b7043e01baee09f0a"
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.2.tgz#a428b28bb26790734c4fc8bc9fa106fccebf6a6c"
 
 validate-npm-package-license@^3.0.1:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz#81643bcbef1bdfecd4623793dc4648948ba98338"
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
   dependencies:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
@@ -3648,8 +3678,8 @@ wide-align@^1.1.0:
     string-width "^1.0.2 || 2"
 
 widest-line@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-2.0.0.tgz#0142a4e8a243f8882c0233aa0e0281aa76152273"
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-2.0.1.tgz#7438764730ec7ef4381ce4df82fb98a53142a3fc"
   dependencies:
     string-width "^2.1.1"
 
@@ -3700,7 +3730,7 @@ yallist@^3.0.0, yallist@^3.0.2:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
 
 yargs-parser@^10.0.0:
-  version "10.0.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.0.0.tgz#c737c93de2567657750cb1f2c00be639fd19c994"
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
   dependencies:
     camelcase "^4.1.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_storage_drag_and_drop
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Dave O'Keeffe
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-25 00:00:00.000000000 Z
+date: 2018-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler