diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-03-30 10:14:34 -0400 |
---|---|---|
committer | Harrison Healey <harrisonmhealey@gmail.com> | 2016-03-30 10:14:34 -0400 |
commit | b6d6153afb07bc18ef162d063c0a413f80a59f52 (patch) | |
tree | a958eed23f1170706d85a8db0bce26c73554dc1d /webapp | |
parent | 55f3ae576d47245dcc8393b0ffbefb38eba65645 (diff) | |
download | chat-b6d6153afb07bc18ef162d063c0a413f80a59f52.tar.gz chat-b6d6153afb07bc18ef162d063c0a413f80a59f52.tar.bz2 chat-b6d6153afb07bc18ef162d063c0a413f80a59f52.zip |
Fixed leaving a direct channel so that it doesn't open the channel you just left
Diffstat (limited to 'webapp')
-rw-r--r-- | webapp/components/sidebar.jsx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/webapp/components/sidebar.jsx b/webapp/components/sidebar.jsx index 45bca7212..b22d3ec34 100644 --- a/webapp/components/sidebar.jsx +++ b/webapp/components/sidebar.jsx @@ -238,7 +238,9 @@ export default class Sidebar extends React.Component { }); } - handleLeaveDirectChannel(channel) { + handleLeaveDirectChannel(e, channel) { + e.preventDefault(); + if (!this.isLeaving.get(channel.id)) { this.isLeaving.set(channel.id, true); @@ -258,7 +260,7 @@ export default class Sidebar extends React.Component { } if (channel.id === this.state.activeId) { - browserHistory.push(TeamStore.getCurrentTeamUrl() + '/channels/town-square'); + browserHistory.push('/' + this.state.currentTeam.name + '/channels/town-square'); } } @@ -422,7 +424,7 @@ export default class Sidebar extends React.Component { overlay={removeTooltip} > <span - onClick={() => handleClose(channel)} + onClick={(e) => handleClose(e, channel)} className='btn-close' > {'×'} |