diff options
author | Christopher Speller <crspeller@gmail.com> | 2015-11-11 13:56:43 -0500 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2015-11-11 13:56:43 -0500 |
commit | 520a1e259e560b0889ca01cc34921d4940ae4c65 (patch) | |
tree | b79bff1c17c641bb24cf04c7292663eed4ea4ef0 /web/react/components/posts_view_container.jsx | |
parent | e32b92052e48a37e7989d89d5969ea9a13ca43ae (diff) | |
parent | 72c7e066446b7abdce74d74a9aee60c4eac0935c (diff) | |
download | chat-520a1e259e560b0889ca01cc34921d4940ae4c65.tar.gz chat-520a1e259e560b0889ca01cc34921d4940ae4c65.tar.bz2 chat-520a1e259e560b0889ca01cc34921d4940ae4c65.zip |
Merge pull request #1399 from mattermost/plt-1104
Fix channel invite button on channel intro message and fix empty channel invite modal.
Diffstat (limited to 'web/react/components/posts_view_container.jsx')
-rw-r--r-- | web/react/components/posts_view_container.jsx | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/web/react/components/posts_view_container.jsx b/web/react/components/posts_view_container.jsx index 5037a86cd..8b92a26a7 100644 --- a/web/react/components/posts_view_container.jsx +++ b/web/react/components/posts_view_container.jsx @@ -3,6 +3,7 @@ const PostsView = require('./posts_view.jsx'); const LoadingScreen = require('./loading_screen.jsx'); +const ChannelInviteModal = require('./channel_invite_modal.jsx'); const ChannelStore = require('../stores/channel_store.jsx'); const PostStore = require('../stores/post_store.jsx'); @@ -50,6 +51,7 @@ export default class PostsViewContainer extends React.Component { }); } + state.showInviteModal = false; this.state = state; } componentDidMount() { @@ -248,7 +250,7 @@ export default class PostsViewContainer extends React.Component { postViewScrolled={this.handlePostsViewScroll} loadMorePostsTopClicked={this.loadMorePostsTop} numPostsToDisplay={this.state.numPostsToDisplay} - introText={channel ? createChannelIntroMessage(channel) : null} + introText={channel ? createChannelIntroMessage(channel, () => this.setState({showInviteModal: true})) : null} messageSeparatorTime={this.state.currentLastViewed} /> ); @@ -263,7 +265,13 @@ export default class PostsViewContainer extends React.Component { } return ( - <div id='post-list'>{postListCtls}</div> + <div id='post-list'> + {postListCtls} + <ChannelInviteModal + show={this.state.showInviteModal} + onModalDismissed={() => this.setState({showInviteModal: false})} + /> + </div> ); } } |