diff options
author | Christopher Speller <crspeller@gmail.com> | 2016-11-14 07:09:41 -0500 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-11-14 07:09:41 -0500 |
commit | 323ce8b203c570ed6a1dd57b44d6637ad8207616 (patch) | |
tree | efc3c61b905244bdb0e1ace0ce9f5ae4876644ad /webapp/components/more_direct_channels.jsx | |
parent | d1207d34c1d99eba9ebf85c98d267ee7e955ea7d (diff) | |
parent | b55ec6148caa93d54b660afe55408c643d217108 (diff) | |
download | chat-323ce8b203c570ed6a1dd57b44d6637ad8207616.tar.gz chat-323ce8b203c570ed6a1dd57b44d6637ad8207616.tar.bz2 chat-323ce8b203c570ed6a1dd57b44d6637ad8207616.zip |
Merge branch 'release-3.5'
Diffstat (limited to 'webapp/components/more_direct_channels.jsx')
-rw-r--r-- | webapp/components/more_direct_channels.jsx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/webapp/components/more_direct_channels.jsx b/webapp/components/more_direct_channels.jsx index f672cb617..50ab5224a 100644 --- a/webapp/components/more_direct_channels.jsx +++ b/webapp/components/more_direct_channels.jsx @@ -38,6 +38,7 @@ export default class MoreDirectChannels extends React.Component { users: null, loadingDMChannel: -1, listType: 'team', + show: true, search: false }; } @@ -60,15 +61,17 @@ export default class MoreDirectChannels extends React.Component { } handleHide() { - if (this.props.onModalDismissed) { - this.props.onModalDismissed(); - } + this.setState({show: false}); } handleExit() { if (this.exitToDirectChannel) { browserHistory.push(this.exitToDirectChannel); } + + if (this.props.onModalDismissed) { + this.props.onModalDismissed(); + } } handleShowDirectChannel(teammate, e) { @@ -220,7 +223,7 @@ export default class MoreDirectChannels extends React.Component { return ( <Modal dialogClassName='more-modal more-direct-channels' - show={this.props.show} + show={this.state.show} onHide={this.handleHide} onExited={this.handleExit} > @@ -262,6 +265,5 @@ export default class MoreDirectChannels extends React.Component { } MoreDirectChannels.propTypes = { - show: React.PropTypes.bool.isRequired, onModalDismissed: React.PropTypes.func }; |