From 9404c580736ff4e8d8b33fd65a5347e1ca112625 Mon Sep 17 00:00:00 2001 From: Artur Paikin Date: Tue, 20 Sep 2016 02:14:55 -0400 Subject: [PATCH] add core prefix everywhere --- src/core/Core.js | 1 - src/plugins/Formtag.js | 2 +- src/plugins/Multipart.js | 13 +++++++++---- src/plugins/Tus10.js | 5 +++++ 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/core/Core.js b/src/core/Core.js index 59a5061d9..53ffeb681 100644 --- a/src/core/Core.js +++ b/src/core/Core.js @@ -212,7 +212,6 @@ export default class Core { }) this.on('core:upload-progress', (data) => { - console.log(data) const fileID = data.id const updatedFiles = Object.assign({}, this.getState().files) if (!updatedFiles[fileID]) { diff --git a/src/plugins/Formtag.js b/src/plugins/Formtag.js index 3ad2b7ca7..bbf2638fd 100644 --- a/src/plugins/Formtag.js +++ b/src/plugins/Formtag.js @@ -33,7 +33,7 @@ export default class Formtag extends Plugin { const files = Utils.toArray(ev.target.files) files.forEach((file) => { - this.core.emitter.emit('file-add', { + this.core.emitter.emit('core:file-add', { source: this.id, name: file.name, type: file.type, diff --git a/src/plugins/Multipart.js b/src/plugins/Multipart.js index fb6c84caf..7eed18561 100644 --- a/src/plugins/Multipart.js +++ b/src/plugins/Multipart.js @@ -43,7 +43,7 @@ export default class Multipart extends Plugin { xhr.upload.addEventListener('progress', (ev) => { if (ev.lengthComputable) { // Dispatch progress event - this.core.emitter.emit('upload-progress', { + this.core.emitter.emit('core:upload-progress', { uploader: this, id: file.id, bytesUploaded: ev.loaded, @@ -57,7 +57,7 @@ export default class Multipart extends Plugin { const resp = JSON.parse(xhr.response) const uploadURL = resp[this.opts.responseUrlFieldName] - this.core.emitter.emit('upload-success', file.id, uploadURL) + this.core.emitter.emit('core:upload-success', file.id, uploadURL) this.core.log(`Download ${file.name} from ${file.uploadURL}`) return resolve(file) @@ -78,11 +78,16 @@ export default class Multipart extends Plugin { xhr.open('POST', this.opts.endpoint, true) xhr.send(formPost) - this.core.emitter.emit('core:file-upload-started', file.id) + this.core.emitter.emit('core:upload-started', file.id) }) } selectForUpload (files) { + if (Object.keys(files).length === 0) { + this.core.log('no files to upload!') + return + } + const filesForUpload = [] Object.keys(files).forEach((file) => { if (files[file].progress.percentage === 0) { @@ -114,7 +119,7 @@ export default class Multipart extends Plugin { const bus = this.core.emitter bus.on('core:upload', () => { this.core.log('Multipart is uploading...') - const files = this.core.state.files + const files = this.core.getState().files this.selectForUpload(files) }) } diff --git a/src/plugins/Tus10.js b/src/plugins/Tus10.js index 14973e86e..22a665ffe 100644 --- a/src/plugins/Tus10.js +++ b/src/plugins/Tus10.js @@ -200,6 +200,11 @@ export default class Tus10 extends Plugin { } uploadFiles (files) { + if (Object.keys(files).length === 0) { + this.core.log('no files to upload!') + return + } + const uploaders = [] files.forEach((file, index) => { const current = parseInt(index, 10) + 1