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/create_post.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/create_post.jsx')
-rw-r--r-- | webapp/components/create_post.jsx | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/webapp/components/create_post.jsx b/webapp/components/create_post.jsx index 9bbc44f38..011e0c2b8 100644 --- a/webapp/components/create_post.jsx +++ b/webapp/components/create_post.jsx @@ -253,9 +253,11 @@ class CreatePost extends React.Component { draft.previews = draft.previews.concat(filenames); PostStore.storeDraft(channelId, draft); - this.setState({uploadsInProgress: draft.uploadsInProgress, previews: draft.previews}); + if (channelId === this.state.channelId) { + this.setState({uploadsInProgress: draft.uploadsInProgress, previews: draft.previews}); + } } - handleUploadError(err, clientId) { + handleUploadError(err, clientId, channelId) { let message = err; if (message && typeof message !== 'string') { // err is an AppError from the server @@ -263,16 +265,18 @@ class CreatePost extends React.Component { } if (clientId !== -1) { - const draft = PostStore.getDraft(this.state.channelId); + const draft = PostStore.getDraft(channelId); const index = draft.uploadsInProgress.indexOf(clientId); if (index !== -1) { draft.uploadsInProgress.splice(index, 1); } - PostStore.storeDraft(this.state.channelId, draft); + PostStore.storeDraft(channelId, draft); - this.setState({uploadsInProgress: draft.uploadsInProgress}); + if (channelId === this.state.channelId) { + this.setState({uploadsInProgress: draft.uploadsInProgress}); + } } this.setState({serverError: message}); |