diff options
author | Joram Wilander <jwawilander@gmail.com> | 2015-12-04 08:21:39 -0500 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2015-12-04 08:21:39 -0500 |
commit | 04727955cd73864d23be9da7fb999d23e93a20e0 (patch) | |
tree | 60f7b58a68693a7b80853ec88f533264c104e9ae /web/react/components/posts_view_container.jsx | |
parent | 93db32da7b97f4d4c10afc17f48c2221eefb54c7 (diff) | |
parent | bc173ebcb47f60d5e99081156575a8ace98fe168 (diff) | |
download | chat-04727955cd73864d23be9da7fb999d23e93a20e0.tar.gz chat-04727955cd73864d23be9da7fb999d23e93a20e0.tar.bz2 chat-04727955cd73864d23be9da7fb999d23e93a20e0.zip |
Merge pull request #1600 from hmhealey/plt1152
PLT-1152 Fix cross-contamination between invite member modals
Diffstat (limited to 'web/react/components/posts_view_container.jsx')
-rw-r--r-- | web/react/components/posts_view_container.jsx | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/web/react/components/posts_view_container.jsx b/web/react/components/posts_view_container.jsx index 6d6694fec..631bd1872 100644 --- a/web/react/components/posts_view_container.jsx +++ b/web/react/components/posts_view_container.jsx @@ -3,7 +3,6 @@ import PostsView from './posts_view.jsx'; import LoadingScreen from './loading_screen.jsx'; -import ChannelInviteModal from './channel_invite_modal.jsx'; import ChannelStore from '../stores/channel_store.jsx'; import PostStore from '../stores/post_store.jsx'; @@ -13,7 +12,7 @@ import * as EventHelpers from '../dispatcher/event_helpers.jsx'; import Constants from '../utils/constants.jsx'; -import {createChannelIntroMessage} from '../utils/channel_intro_mssages.jsx'; +import {createChannelIntroMessage} from '../utils/channel_intro_messages.jsx'; export default class PostsViewContainer extends React.Component { constructor() { @@ -177,7 +176,7 @@ export default class PostsViewContainer extends React.Component { loadMorePostsBottomClicked={() => {}} showMoreMessagesTop={!this.state.atTop[this.state.currentChannelIndex]} showMoreMessagesBottom={false} - introText={channel ? createChannelIntroMessage(channel, () => this.setState({showInviteModal: true})) : null} + introText={channel ? createChannelIntroMessage(channel) : null} messageSeparatorTime={this.state.currentLastViewed} /> ); @@ -194,10 +193,6 @@ export default class PostsViewContainer extends React.Component { return ( <div id='post-list'> {postListCtls} - <ChannelInviteModal - show={this.state.showInviteModal} - onModalDismissed={() => this.setState({showInviteModal: false})} - /> </div> ); } |