diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2015-08-18 12:09:42 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2015-08-18 12:09:42 -0400 |
| commit | 44464f8f3c99ea4bae744a45e2924330a72f9b17 (patch) | |
| tree | 8ad4d7f3c5f5553e8ab7c0e5a238b1fd1bbbee03 /web | |
| parent | 78c4bff0c179a952920d167378234bff847682fc (diff) | |
| parent | 8fa7a4251a671ebe7056fe77df246e0f9e061a5b (diff) | |
| download | chat-44464f8f3c99ea4bae744a45e2924330a72f9b17.tar.gz chat-44464f8f3c99ea4bae744a45e2924330a72f9b17.tar.bz2 chat-44464f8f3c99ea4bae744a45e2924330a72f9b17.zip | |
Merge pull request #395 from mattermost/merge-fix
Fix a bad merge that had edited posts being handled sloppily.
Diffstat (limited to 'web')
| -rw-r--r-- | web/react/components/post_list.jsx | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/web/react/components/post_list.jsx b/web/react/components/post_list.jsx index c210853ac..bebd6847f 100644 --- a/web/react/components/post_list.jsx +++ b/web/react/components/post_list.jsx @@ -198,12 +198,6 @@ module.exports = React.createClass({ PostStore.storePost(post); } else if (msg.action === 'post_edited') { if (this.state.channel.id === msg.channel_id) { - this.setState({postList: postList}); - } - - PostStore.storePosts(post.channel_id, postList); - } else if (msg.action === 'post_edited') { - if (this.state.channel.id === msg.channel_id) { postList = this.state.postList; if (!(msg.props.post_id in postList.posts)) { return; |