diff options
author | Christopher Speller <crspeller@gmail.com> | 2016-11-24 09:08:46 -0500 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-11-24 09:08:46 -0500 |
commit | c96ecae6da31aceabf29586cde872876b81d11d9 (patch) | |
tree | 94df09df540da846bb4c6ed50e8bd7879cff63ba /webapp/components/sidebar_header_dropdown.jsx | |
parent | b212acf312ad640455fa715427ac19e6930dc61d (diff) | |
parent | 36f62c9e82350f58c902f64a5d3304872431ad41 (diff) | |
download | chat-c96ecae6da31aceabf29586cde872876b81d11d9.tar.gz chat-c96ecae6da31aceabf29586cde872876b81d11d9.tar.bz2 chat-c96ecae6da31aceabf29586cde872876b81d11d9.zip |
Merge branch 'release-3.5'
Diffstat (limited to 'webapp/components/sidebar_header_dropdown.jsx')
-rw-r--r-- | webapp/components/sidebar_header_dropdown.jsx | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/webapp/components/sidebar_header_dropdown.jsx b/webapp/components/sidebar_header_dropdown.jsx index b665eef52..aa5226702 100644 --- a/webapp/components/sidebar_header_dropdown.jsx +++ b/webapp/components/sidebar_header_dropdown.jsx @@ -45,6 +45,7 @@ export default class SidebarHeaderDropdown extends React.Component { this.showGetTeamInviteLinkModal = this.showGetTeamInviteLinkModal.bind(this); this.showTeamMembersModal = this.showTeamMembersModal.bind(this); this.hideTeamMembersModal = this.hideTeamMembersModal.bind(this); + this.handleSwitchTeams = this.handleSwitchTeams.bind(this); this.onTeamChange = this.onTeamChange.bind(this); this.openAccountSettings = this.openAccountSettings.bind(this); @@ -131,6 +132,11 @@ export default class SidebarHeaderDropdown extends React.Component { }); } + handleSwitchTeams() { + // The actual switching of teams is handled by the react-router Link + this.setState({showDropdown: false}); + } + componentDidMount() { TeamStore.addChangeListener(this.onTeamChange); document.addEventListener('keydown', this.openAccountSettings); @@ -367,6 +373,7 @@ export default class SidebarHeaderDropdown extends React.Component { <li key={'team_' + team.name}> <Link to={'/' + team.name + '/channels/town-square'} + onClick={this.handleSwitchTeams} > <FormattedMessage id='navbar_dropdown.switchTo' |