fix metadata and core:file-added event

examples/bundled-example/main.js

@@ -23,6 +23,9 @@ const TUS_ENDPOINT = PROTOCOL + '://master.tus.io/files/'
 const uppy = Uppy({
   debug: true,
   autoProceed: false,
+  meta: {
+    username: 'John'
+  },
   restrictions: {
     maxFileSize: 300000,
     maxNumberOfFiles: 5,

src/core/Core.js

@@ -247,9 +247,7 @@ class Uppy {
           id: fileID,
           name: fileName,
           extension: fileExtension || '',
-          meta: {
-            name: fileName
-          },
+          meta: Object.assign({}, { name: fileName }, this.getState().meta),
           type: {
             general: fileTypeGeneral,
             specific: fileTypeSpecific
@@ -278,14 +276,14 @@ class Uppy {
         updatedFiles[fileID] = newFile
         this.setState({files: updatedFiles})
 
-        this.bus.emit('file-added', fileID)
+        this.emit('core:file-added', fileID)
         this.log(`Added file: ${fileName}, ${fileID}, mime type: ${fileType}`)
 
         if (this.opts.autoProceed && !this.scheduledAutoProceed) {
           this.scheduledAutoProceed = setTimeout(() => {
             this.scheduledAutoProceed = null
             this.upload().catch((err) => {
-              console.error(err.stack || err.message)
+              console.error(err.stack || err.message || err)
             })
           }, 4)
         }

src/plugins/MetaData.js

@@ -27,6 +27,7 @@ module.exports = class MetaData extends Plugin {
     metaFields.forEach((item) => {
       const obj = {}
       obj[item.id] = item.value
+      console.log(obj)
       this.core.updateMeta(obj, fileID)
     })
   }
@@ -38,7 +39,7 @@ module.exports = class MetaData extends Plugin {
       metaFields: metaFields
     })
 
-    this.core.emitter.on('core:file-added', this.handleFileAdded)
+    this.core.on('core:file-added', this.handleFileAdded)
   }
 
   install () {
@@ -46,6 +47,6 @@ module.exports = class MetaData extends Plugin {
   }
 
   uninstall () {
-    this.core.emitter.off('core:file-added', this.handleFileAdded)
+    this.core.off('core:file-added', this.handleFileAdded)
   }
 }