diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2017-05-03 11:55:06 -0400 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2017-05-03 08:55:06 -0700 |
| commit | ec5f40a4235369de7ffb45caaee822cbc1a7d8ba (patch) | |
| tree | 7120f075ba8cf82e8bee6951e9cb48207da5b9a2 /webapp/actions | |
| parent | 6a6c5365d335666b5f76b92d1f41314e6873197f (diff) | |
| download | chat-ec5f40a4235369de7ffb45caaee822cbc1a7d8ba.tar.gz chat-ec5f40a4235369de7ffb45caaee822cbc1a7d8ba.tar.bz2 chat-ec5f40a4235369de7ffb45caaee822cbc1a7d8ba.zip | |
Add back button to RHS threads from pinned posts (#6306)
Diffstat (limited to 'webapp/actions')
| -rw-r--r-- | webapp/actions/global_actions.jsx | 3 | ||||
| -rw-r--r-- | webapp/actions/post_actions.jsx | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/webapp/actions/global_actions.jsx b/webapp/actions/global_actions.jsx index 97d3b1071..8d3eddfd9 100644 --- a/webapp/actions/global_actions.jsx +++ b/webapp/actions/global_actions.jsx @@ -168,7 +168,8 @@ export function emitPostFocusRightHandSideFromSearch(post, isMentionSearch) { type: ActionTypes.RECEIVED_POST_SELECTED, postId: Utils.getRootId(post), from_search: SearchStore.getSearchTerm(), - from_flagged_posts: SearchStore.getIsFlaggedPosts() + from_flagged_posts: SearchStore.getIsFlaggedPosts(), + from_pinned_posts: SearchStore.getIsPinnedPosts() }); AppDispatcher.handleServerAction({ diff --git a/webapp/actions/post_actions.jsx b/webapp/actions/post_actions.jsx index 3174fe681..969c764f1 100644 --- a/webapp/actions/post_actions.jsx +++ b/webapp/actions/post_actions.jsx @@ -142,7 +142,7 @@ export function getFlaggedPosts() { ); } -export function getPinnedPosts(channelId) { +export function getPinnedPosts(channelId = ChannelStore.getCurrentId()) { Client.getPinnedPosts(channelId, (data) => { AppDispatcher.handleServerAction({ |