From c9bb7e85f7f273b1f1dbec81a07cc02545410ec4 Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Mon, 17 Aug 2015 10:51:17 -0400 Subject: fix minor issues caused by rebase --- web/react/components/post_list.jsx | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'web/react/components') diff --git a/web/react/components/post_list.jsx b/web/react/components/post_list.jsx index 5f977972b..fed8a86bd 100644 --- a/web/react/components/post_list.jsx +++ b/web/react/components/post_list.jsx @@ -18,18 +18,22 @@ var ActionTypes = Constants.ActionTypes; function getStateFromStores() { var channel = ChannelStore.getCurrent(); - if (channel == null) channel = {}; + if (channel == null) { + channel = {}; + } - var post_list = PostStore.getCurrentPosts(); - var pending_post_list = PostStore.getPendingPosts(channel.id); + var postList = PostStore.getCurrentPosts(); + var pendingPostList = PostStore.getPendingPosts(channel.id); - if (pending_post_list) { - post_list.order = pending_post_list.order.concat(post_list.order); - for (var pid in pending_post_list.posts) { post_list.posts[pid] = pending_post_list.posts[pid] }; + if (pendingPostList) { + postList.order = pendingPostList.order.concat(postList.order); + for (var pid in pendingPostList.posts) { + postList.posts[pid] = pendingPostList.posts[pid]; + } } return { - post_list: post_list, + postList: postList, channel: channel }; } -- cgit v1.2.3-1-g7c22