diff options
author | Joram Wilander <jwawilander@gmail.com> | 2016-05-03 11:00:06 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2016-05-03 11:00:06 -0400 |
commit | 05a203b409ae461a99ca6f6e21d867c81ba071fa (patch) | |
tree | 3e305ba72bf6b8b3f0bcbf962e2a92b4c6daddf7 /webapp/components/file_upload.jsx | |
parent | 3a17fd86a0345b2410cf885bf4e862c6c3505745 (diff) | |
download | chat-05a203b409ae461a99ca6f6e21d867c81ba071fa.tar.gz chat-05a203b409ae461a99ca6f6e21d867c81ba071fa.tar.bz2 chat-05a203b409ae461a99ca6f6e21d867c81ba071fa.zip |
Fix uploaded files being previewed on wrong channels (#2860)
Diffstat (limited to 'webapp/components/file_upload.jsx')
-rw-r--r-- | webapp/components/file_upload.jsx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/webapp/components/file_upload.jsx b/webapp/components/file_upload.jsx index 8e4019f6f..8e631ac95 100644 --- a/webapp/components/file_upload.jsx +++ b/webapp/components/file_upload.jsx @@ -49,15 +49,15 @@ class FileUpload extends React.Component { fileUploadSuccess(channelId, data) { this.props.onFileUpload(data.filenames, data.client_ids, channelId); - const requests = JSON.parse(JSON.stringify(this.state.requests)); + const requests = Object.assign({}, this.state.requests); for (var j = 0; j < data.client_ids.length; j++) { Reflect.deleteProperty(requests, data.client_ids[j]); } this.setState({requests}); } - fileUploadFail(clientId, err) { - this.props.onUploadError(err, clientId); + fileUploadFail(clientId, channelId, err) { + this.props.onUploadError(err, clientId, channelId); } uploadFiles(files) { @@ -86,7 +86,7 @@ class FileUpload extends React.Component { channelId, clientId, this.fileUploadSuccess.bind(this, channelId), - this.fileUploadFail.bind(this, clientId) + this.fileUploadFail.bind(this, clientId, channelId) ); const requests = this.state.requests; |