summaryrefslogtreecommitdiffstats
path: root/webapp/components/sidebar_right.jsx
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2017-05-03 11:55:06 -0400
committerCorey Hulen <corey@hulen.com>2017-05-03 08:55:06 -0700
commitec5f40a4235369de7ffb45caaee822cbc1a7d8ba (patch)
tree7120f075ba8cf82e8bee6951e9cb48207da5b9a2 /webapp/components/sidebar_right.jsx
parent6a6c5365d335666b5f76b92d1f41314e6873197f (diff)
downloadchat-ec5f40a4235369de7ffb45caaee822cbc1a7d8ba.tar.gz
chat-ec5f40a4235369de7ffb45caaee822cbc1a7d8ba.tar.bz2
chat-ec5f40a4235369de7ffb45caaee822cbc1a7d8ba.zip
Add back button to RHS threads from pinned posts (#6306)
Diffstat (limited to 'webapp/components/sidebar_right.jsx')
-rw-r--r--webapp/components/sidebar_right.jsx6
1 files changed, 4 insertions, 2 deletions
diff --git a/webapp/components/sidebar_right.jsx b/webapp/components/sidebar_right.jsx
index 483d30fc7..b4ca2f53c 100644
--- a/webapp/components/sidebar_right.jsx
+++ b/webapp/components/sidebar_right.jsx
@@ -135,11 +135,12 @@ export default class SidebarRight extends React.Component {
});
}
- onSelectedChange(fromSearch, fromFlaggedPosts) {
+ onSelectedChange(fromSearch, fromFlaggedPosts, fromPinnedPosts) {
this.setState({
postRightVisible: Boolean(PostStore.getSelectedPost()),
fromSearch,
- fromFlaggedPosts
+ fromFlaggedPosts,
+ fromPinnedPosts
});
}
@@ -230,6 +231,7 @@ export default class SidebarRight extends React.Component {
<RhsThread
fromFlaggedPosts={this.state.fromFlaggedPosts}
fromSearch={this.state.fromSearch}
+ fromPinnedPosts={this.state.fromPinnedPosts}
isWebrtc={WebrtcStore.isBusy()}
isMentionSearch={this.state.isMentionSearch}
currentUser={this.state.currentUser}