Renée Kooi пре 6 година
родитељ
комит
d93ab6603f

+ 2 - 1
packages/@uppy/transloadit/src/AssemblyOptions.js

@@ -133,4 +133,5 @@ class AssemblyOptions {
   }
   }
 }
 }
 
 
-module.exports = Object.assign(AssemblyOptions, { validateParams })
+module.exports = AssemblyOptions
+module.exports.validateParams = validateParams

+ 10 - 5
packages/@uppy/transloadit/src/index.js

@@ -52,7 +52,10 @@ module.exports = class Transloadit extends Plugin {
       locale: defaultLocale
       locale: defaultLocale
     }
     }
 
 
-    this.opts = Object.assign({}, defaultOptions, opts)
+    this.opts = {
+      ...defaultOptions,
+      ...opts
+    }
 
 
     // i18n
     // i18n
     this.translator = new Translator([ defaultLocale, this.uppy.locale, this.opts.locale ])
     this.translator = new Translator([ defaultLocale, this.uppy.locale, this.opts.locale ])
@@ -268,13 +271,14 @@ module.exports = class Transloadit extends Plugin {
       return
       return
     }
     }
     this.setPluginState({
     this.setPluginState({
-      files: Object.assign({}, state.files, {
+      files: {
+        ...state.files,
         [uploadedFile.id]: {
         [uploadedFile.id]: {
           assembly: assemblyId,
           assembly: assemblyId,
           id: file.id,
           id: file.id,
           uploadedFile
           uploadedFile
         }
         }
-      })
+      }
     })
     })
     this.uppy.emit('transloadit:upload', uploadedFile, this.getAssembly(assemblyId))
     this.uppy.emit('transloadit:upload', uploadedFile, this.getAssembly(assemblyId))
   }
   }
@@ -316,9 +320,10 @@ module.exports = class Transloadit extends Plugin {
     this.client.getAssemblyStatus(url).then((finalStatus) => {
     this.client.getAssemblyStatus(url).then((finalStatus) => {
       const state = this.getPluginState()
       const state = this.getPluginState()
       this.setPluginState({
       this.setPluginState({
-        assemblies: Object.assign({}, state.assemblies, {
+        assemblies: {
+          ...state.assemblies,
           [finalStatus.assembly_id]: finalStatus
           [finalStatus.assembly_id]: finalStatus
-        })
+        }
       })
       })
       this.uppy.emit('transloadit:complete', finalStatus)
       this.uppy.emit('transloadit:complete', finalStatus)
     })
     })