diff options
author | hmhealey <harrisonmhealey@gmail.com> | 2015-12-18 17:58:08 -0500 |
---|---|---|
committer | hmhealey <harrisonmhealey@gmail.com> | 2015-12-18 17:58:08 -0500 |
commit | e92d1faf4ef59ba96eb6ddb1c882bdbb93afed3f (patch) | |
tree | e4aa61a03e111f69da9ccbcb22aa618c364d5192 /web | |
parent | bb9cb1029539b179725a586057c39507597300de (diff) | |
download | chat-e92d1faf4ef59ba96eb6ddb1c882bdbb93afed3f.tar.gz chat-e92d1faf4ef59ba96eb6ddb1c882bdbb93afed3f.tar.bz2 chat-e92d1faf4ef59ba96eb6ddb1c882bdbb93afed3f.zip |
Changed how the sidebar opens the more channels modal
Diffstat (limited to 'web')
-rw-r--r-- | web/react/components/sidebar.jsx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx index cc2279b57..18c360cb8 100644 --- a/web/react/components/sidebar.jsx +++ b/web/react/components/sidebar.jsx @@ -39,6 +39,7 @@ export default class Sidebar extends React.Component { this.handleLeaveDirectChannel = this.handleLeaveDirectChannel.bind(this); this.handleResize = this.handleResize.bind(this); + this.showMoreChannelsModal = this.showMoreChannelsModal.bind(this); this.showNewChannelModal = this.showNewChannelModal.bind(this); this.hideNewChannelModal = this.hideNewChannelModal.bind(this); this.showMoreDirectChannelsModal = this.showMoreDirectChannelsModal.bind(this); @@ -250,6 +251,11 @@ export default class Sidebar extends React.Component { return a.display_name.localeCompare(b.display_name); } + showMoreChannelsModal() { + // manually show the modal because using data-toggle messes with keyboard focus when the modal is dismissed + $('#more_channels').modal({'data-channeltype': 'O'}).modal('show'); + } + showNewChannelModal(type) { this.setState({newChannelModalType: type}); } @@ -594,10 +600,8 @@ export default class Sidebar extends React.Component { <li> <a href='#' - data-toggle='modal' className='nav-more' - data-target='#more_channels' - data-channeltype='O' + onClick={this.showMoreChannelsModal} > {'More...'} </a> |