From 6463f9e1a43d629fcaec8dbdf4ce789af23c6565 Mon Sep 17 00:00:00 2001 From: Artur Paikin Date: Fri, 14 Sep 2018 16:27:41 -0400 Subject: [PATCH] call `removeFile` on each file when doing `cancelAll` --- packages/@uppy/core/src/index.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/@uppy/core/src/index.js b/packages/@uppy/core/src/index.js index 3e9736e55..5c34b6a39 100644 --- a/packages/@uppy/core/src/index.js +++ b/packages/@uppy/core/src/index.js @@ -505,8 +505,6 @@ class Uppy { if (removedFile.preview && isObjectURL(removedFile.preview)) { URL.revokeObjectURL(removedFile.preview) } - - this.log(`Removed file: ${fileID}`) } pauseResume (fileID) { @@ -588,16 +586,18 @@ class Uppy { cancelAll () { this.emit('cancel-all') - // TODO Or should we just call removeFile on all files? const { currentUploads } = this.getState() const uploadIDs = Object.keys(currentUploads) - uploadIDs.forEach((id) => { this._removeUpload(id) }) + const files = Object.keys(this.getState().files) + files.forEach((fileID) => { + this.removeFile(fileID) + }) + this.setState({ - files: {}, totalProgress: 0, error: null })