diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-09-03 13:39:22 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-09-03 13:39:22 -0700 |
| commit | 05d95d80a896d14474c7f7384d67b9edd524b922 (patch) | |
| tree | 2fcc619c38175014813ffc7df34abad82e5d5b77 /web/react/components/more_channels.jsx | |
| parent | 48ca3a4007c8b9c40a3bc3789563ed9992e9b64d (diff) | |
| parent | 4f0c06114b61c92d982baac1c54ed80da93a9cc9 (diff) | |
| download | chat-05d95d80a896d14474c7f7384d67b9edd524b922.tar.gz chat-05d95d80a896d14474c7f7384d67b9edd524b922.tar.bz2 chat-05d95d80a896d14474c7f7384d67b9edd524b922.zip | |
Merge branch 'master' into PLT-12
Diffstat (limited to 'web/react/components/more_channels.jsx')
| -rw-r--r-- | web/react/components/more_channels.jsx | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/web/react/components/more_channels.jsx b/web/react/components/more_channels.jsx index 08b2d7460..ba8be12b2 100644 --- a/web/react/components/more_channels.jsx +++ b/web/react/components/more_channels.jsx @@ -86,15 +86,21 @@ export default class MoreChannels extends React.Component { {channels.map(function cMap(channel, index) { var joinButton; if (self.state.joiningChannel === index) { - joinButton = (<img - className='join-channel-loading-gif' - src='/static/images/load.gif' - />); + joinButton = ( + <img + className='join-channel-loading-gif' + src='/static/images/load.gif' + /> + ); } else { - joinButton = (<button - onClick={self.handleJoin.bind(self, channel, index)} - className='btn btn-primary'>Join - </button>); + joinButton = ( + <button + onClick={self.handleJoin.bind(self, channel, index)} + className='btn btn-primary' + > + Join + </button> + ); } return ( @@ -152,7 +158,9 @@ export default class MoreChannels extends React.Component { data-channeltype={this.state.channelType} type='button' className='btn btn-primary channel-create-btn' - onClick={this.handleNewChannel}>Create New Channel + onClick={this.handleNewChannel} + > + Create New Channel </button> </div> <div className='modal-body'> |