summaryrefslogtreecommitdiffstats
path: root/web/react
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-12-01 08:49:26 -0500
committerChristopher Speller <crspeller@gmail.com>2015-12-01 08:49:26 -0500
commit2bfb3493f441d95b67351e03869f8454c4a3a265 (patch)
treef97e3300c5334d1c8c56de32bc8e62de656a50a5 /web/react
parent6e542efb8b3c0eea08129d78d610a667ac3d105e (diff)
parente430b1fd533e42d17d19f99cde1521f51fd221fe (diff)
downloadchat-2bfb3493f441d95b67351e03869f8454c4a3a265.tar.gz
chat-2bfb3493f441d95b67351e03869f8454c4a3a265.tar.bz2
chat-2bfb3493f441d95b67351e03869f8454c4a3a265.zip
Merge pull request #1546 from mattermost/plt-1281
PLT-1281 Make sure to have latest posts for the view when switching to a channel
Diffstat (limited to 'web/react')
-rw-r--r--web/react/components/posts_view_container.jsx4
-rw-r--r--web/react/stores/post_store.jsx2
2 files changed, 4 insertions, 2 deletions
diff --git a/web/react/components/posts_view_container.jsx b/web/react/components/posts_view_container.jsx
index 367d3687e..6d6694fec 100644
--- a/web/react/components/posts_view_container.jsx
+++ b/web/react/components/posts_view_container.jsx
@@ -99,10 +99,12 @@ export default class PostsViewContainer extends React.Component {
if (newIndex === -1) {
newIndex = channels.length;
channels.push(channelId);
- postLists[newIndex] = this.getChannelPosts(channelId);
atTop[newIndex] = PostStore.getVisibilityAtTop(channelId);
}
+ // make sure we have the latest posts from the store
+ postLists[newIndex] = this.getChannelPosts(channelId);
+
this.setState({
currentChannelIndex: newIndex,
currentLastViewed: lastViewed,
diff --git a/web/react/stores/post_store.jsx b/web/react/stores/post_store.jsx
index a8f0f9c63..2212edadb 100644
--- a/web/react/stores/post_store.jsx
+++ b/web/react/stores/post_store.jsx
@@ -211,7 +211,7 @@ class PostStoreClass extends EventEmitter {
postList.order = this.postsInfo[id].pendingPosts.order.concat(postList.order);
}
- // Add delteted posts
+ // Add deleted posts
if (this.postsInfo[id].hasOwnProperty('deletedPosts')) {
Object.assign(postList.posts, this.postsInfo[id].deletedPosts);