diff options
author | Christopher Speller <crspeller@gmail.com> | 2015-12-04 08:38:01 -0500 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2015-12-04 08:38:01 -0500 |
commit | 3b892a3d04695f0b76e636418726c3283f03c394 (patch) | |
tree | 04da2da9aa87c8e603d5bec642f9ed42204906d0 /web/react/components | |
parent | 1e654fa77bb4c6d853c42bb08d766070b551290c (diff) | |
parent | 0ce22892a9be07b59a6a55f786049302ec7eb666 (diff) | |
download | chat-3b892a3d04695f0b76e636418726c3283f03c394.tar.gz chat-3b892a3d04695f0b76e636418726c3283f03c394.tar.bz2 chat-3b892a3d04695f0b76e636418726c3283f03c394.zip |
Merge pull request #1611 from mattermost/PLT-1301
PLT-1310 fixing regression caused by fix for PLT-1310
Diffstat (limited to 'web/react/components')
-rw-r--r-- | web/react/components/rhs_thread.jsx | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/web/react/components/rhs_thread.jsx b/web/react/components/rhs_thread.jsx index d111094e7..2edcd8b37 100644 --- a/web/react/components/rhs_thread.jsx +++ b/web/react/components/rhs_thread.jsx @@ -101,6 +101,15 @@ export default class RhsThread extends React.Component { } if (currentPosts.posts[currentPosts.order[0]].channel_id === currentSelected.posts[currentSelected.order[0]].channel_id) { + for (var key in currentSelected.posts) { + if (currentSelected.posts.hasOwnProperty(key)) { + var post = currentSelected.posts[key]; + if (post.pending_post_id) { + Reflect.deleteProperty(currentSelected.posts, key); + } + } + } + for (var postId in currentPosts.posts) { if (currentPosts.posts.hasOwnProperty(postId)) { currentSelected.posts[postId] = currentPosts.posts[postId]; |