Merge branch 'master' of https://github.com/transloadit/uppy

src/core/Core.js

@@ -668,7 +668,7 @@ class Uppy {
     // Install all plugins
     // this.installAll()
 
-    return
+    return this
   }
 
   upload () {

src/plugins/Transloadit/index.js

@@ -156,7 +156,7 @@ module.exports = class Transloadit extends Plugin {
 
       this.core.setState({ files })
 
-      this.core.emit('transloadit:assembly', assembly, fileIDs)
+      this.core.emit('transloadit:assembly-created', assembly, fileIDs)
 
       return this.connectSocket(assembly)
     }).then(() => {

website/src/api-usage-example.ejs

@@ -4,9 +4,9 @@ import Tus10 from 'uppy/lib/plugins/Tus10'
 import MetaData from 'uppy/lib/plugins/MetaData'
  
 const uppy = Uppy({autoProceed: false})
-uppy.use(Dashboard, {trigger: '#select-files', target: '#upload-form', replaceTargetContent: true})
-uppy.use(Tus10, {endpoint: '://master.tus.io/files/'})
-uppy.use(MetaData, {
+  .use(Dashboard, {trigger: '#select-files', target: '#upload-form', replaceTargetContent: true})
+  .use(Tus10, {endpoint: '://master.tus.io/files/'})
+  uppy.use(MetaData, {
     fields: [
       { id: 'resizeTo', name: 'Resize to', value: 1200, placeholder: 'specify future image size' },
       { id: 'description', name: 'Description', value: 'none', placeholder: 'describe what the file is for' }

website/themes/uppy/layout/index.ejs

@@ -87,15 +87,15 @@
   var TUS_ENDPOINT = PROTOCOL + '://master.tus.io/files/'
   
   var uppy = Uppy.Core({debug: true, autoProceed: false})
-  uppy.use(Uppy.Dashboard, {trigger: '#select-files', target: '#upload-form', replaceTargetContent: true})
-  uppy.use(Uppy.Tus10, {endpoint: TUS_ENDPOINT})
-  uppy.use(Uppy.MetaData, {
+  .use(Uppy.Dashboard, {trigger: '#select-files', target: '#upload-form', replaceTargetContent: true})
+  .use(Uppy.Tus10, {endpoint: TUS_ENDPOINT})
+  .use(Uppy.MetaData, {
       fields: [
         { id: 'resizeTo', name: 'Resize to', value: 1200, placeholder: 'specify future image size' },
         { id: 'description', name: 'Description', value: 'none', placeholder: 'describe what the file is for' }
       ]
     })
-  uppy.run()
+  .run()
 
   uppy.on('core:success', (files) => {
     console.log(`Upload complete! We’ve uploaded these files: ${files}`)