cleanup, getMetaFromForm: true by default

src/core/Core.js

@@ -137,6 +137,8 @@ class Uppy {
 
   setMeta (data) {
     const newMeta = Object.assign({}, this.getState().meta, data)
+    this.log('Adding metadata:')
+    this.log(data)
     this.setState({meta: newMeta})
   }
 

src/core/Utils.js

@@ -401,27 +401,6 @@ function findDOMElement (element) {
   }
 }
 
-/**
-* Get metadata object from a form element
-*
-* @param {Node|string} element
-* @return {Object|null}
-*/
-
-function getMetaFromForm (element) {
-  if (!element || element.tagName !== 'FORM') {
-    console.error('Metadata can only be extracted from form elements')
-    return null
-  }
-
-  var formData = new FormData(element)
-  var result = {}
-  for (var entry of formData.entries()) {
-    result[entry[0]] = entry[1]
-  }
-  return result
-}
-
 function getSocketHost (url) {
   // get the host domain
   var regex = /^(?:https?:\/\/|\/\/)?(?:[^@\n]+@)?(?:www\.)?([^\n]+)/
@@ -472,7 +451,6 @@ module.exports = {
   copyToClipboard,
   prettyETA,
   findDOMElement,
-  getMetaFromForm,
   getSocketHost,
   emitSocketProgress
 }

src/plugins/Dashboard/index.js

@@ -42,13 +42,14 @@ module.exports = class DashboardUI extends Plugin {
     // set default options
     const defaultOptions = {
       target: 'body',
+      getMetaFromForm: true,
       inline: false,
       width: 750,
       height: 550,
       semiTransparent: false,
       defaultTabIcon: defaultTabIcon(),
       showProgressDetails: false,
-      setMetaFromTargetForm: false,
+      setMetaFromTargetForm: true,
       locale: defaultLocale
     }
 
@@ -183,7 +184,7 @@ module.exports = class DashboardUI extends Plugin {
     }
 
     if (!this.opts.inline && !showModalTrigger) {
-      console.error('Dashboard modal trigger not found, you won’t be able to select files. Make sure `trigger` is set correctly in Dashboard options')
+      this.core.log('Dashboard modal trigger not found, you won’t be able to select files. Make sure `trigger` is set correctly in Dashboard options', 'error')
     }
 
     document.body.addEventListener('keyup', this.handleEscapeKeyPress)

src/plugins/DragDrop/index.js

@@ -37,7 +37,7 @@ module.exports = class DragDrop extends Plugin {
     // Default options
     const defaultOpts = {
       target: '.UppyDragDrop',
-      setMetaFromTargetForm: false,
+      getMetaFromForm: true,
       locale: defaultLocale
     }
 

src/plugins/FileInput.js

@@ -19,7 +19,7 @@ module.exports = class FileInput extends Plugin {
     // Default options
     const defaultOptions = {
       target: '.UppyForm',
-      getMetaDataFromForm: true,
+      getMetaFromForm: true,
       replaceTargetContent: true,
       multipleFiles: true,
       pretty: true,

src/plugins/Plugin.js

@@ -60,10 +60,9 @@ module.exports = class Plugin {
       this.core.log(`Installing ${callerPluginName} to a DOM element`)
 
       // attempt to extract meta from form element
-      if (this.opts.getMetaDataFromForm && targetElement.nodeName === 'FORM') {
+      if (this.opts.getMetaFromForm && targetElement.nodeName === 'FORM') {
         const formMeta = getFormData(targetElement)
-        this.core.log('Adding metadata from form')
-        this.core.log(formMeta)
+        this.core.setMeta(formMeta)
       }
 
       // clear everything inside the target container