diff options
author | Corey Hulen <corey@hulen.com> | 2015-09-14 16:57:54 -0700 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2015-09-14 16:57:54 -0700 |
commit | bfebb41bc0c0a1c5f481617f912bdf6dd483c341 (patch) | |
tree | f2f62d288f8e3e322d4e33bb22104e433098c336 /web/react/components/sidebar.jsx | |
parent | c447db6e78df1307d2d1245acdd791de6d79716a (diff) | |
parent | 0ea0233c50dbccc498cb53481b9fdf18d027e5b2 (diff) | |
download | chat-bfebb41bc0c0a1c5f481617f912bdf6dd483c341.tar.gz chat-bfebb41bc0c0a1c5f481617f912bdf6dd483c341.tar.bz2 chat-bfebb41bc0c0a1c5f481617f912bdf6dd483c341.zip |
Merge pull request #678 from mattermost/mm-1589
PLT-171 MM-1589 New add channel modal using react-bootstrap.
Diffstat (limited to 'web/react/components/sidebar.jsx')
-rw-r--r-- | web/react/components/sidebar.jsx | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx index ad934d271..977fecb5c 100644 --- a/web/react/components/sidebar.jsx +++ b/web/react/components/sidebar.jsx @@ -12,6 +12,7 @@ var Utils = require('../utils/utils.jsx'); var SidebarHeader = require('./sidebar_header.jsx'); var SearchBox = require('./search_bar.jsx'); var Constants = require('../utils/constants.jsx'); +var NewChannelFlow = require('./new_channel_flow.jsx'); export default class Sidebar extends React.Component { constructor(props) { @@ -28,6 +29,7 @@ export default class Sidebar extends React.Component { this.createChannelElement = this.createChannelElement.bind(this); this.state = this.getStateFromStores(); + this.state.modal = ''; this.state.loadingDMChannel = -1; } getStateFromStores() { @@ -473,8 +475,18 @@ export default class Sidebar extends React.Component { ); } + let showChannelModal = false; + if (this.state.modal !== '') { + showChannelModal = true; + } + return ( <div> + <NewChannelFlow + show={showChannelModal} + channelType={this.state.modal} + onModalDismissed={() => this.setState({modal: ''})} + /> <SidebarHeader teamDisplayName={this.props.teamDisplayName} teamType={this.props.teamType} @@ -508,11 +520,9 @@ export default class Sidebar extends React.Component { <a className='add-channel-btn' href='#' - data-toggle='modal' - data-target='#new_channel' - data-channeltype='O' + onClick={() => this.setState({modal: 'O'})} > - + + {'+'} </a> </h4> </li> @@ -537,11 +547,9 @@ export default class Sidebar extends React.Component { <a className='add-channel-btn' href='#' - data-toggle='modal' - data-target='#new_channel' - data-channeltype='P' + onClick={() => this.setState({modal: 'P'})} > - + + {'+'} </a> </h4> </li> |