diff options
author | Joram Wilander <jwawilander@gmail.com> | 2015-08-18 07:50:08 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2015-08-18 07:50:08 -0400 |
commit | ca6f4e9d034e26a9b2e3051903c5276a4bd12be0 (patch) | |
tree | a95b8ae6717b1133feacb21b0f97ab5855a6e416 /web/react/components | |
parent | a5bff83558c737645c4a3d516047403f69080c2d (diff) | |
parent | 0de580b282169ba540a5e749e03fa8510d1b8895 (diff) | |
download | chat-ca6f4e9d034e26a9b2e3051903c5276a4bd12be0.tar.gz chat-ca6f4e9d034e26a9b2e3051903c5276a4bd12be0.tar.bz2 chat-ca6f4e9d034e26a9b2e3051903c5276a4bd12be0.zip |
Merge pull request #377 from nickago/MM-1894
Mm 1894 Add state listening to the sidebar relative to the team store
Diffstat (limited to 'web/react/components')
-rw-r--r-- | web/react/components/sidebar.jsx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx index 80e3632c7..a8496b385 100644 --- a/web/react/components/sidebar.jsx +++ b/web/react/components/sidebar.jsx @@ -128,6 +128,7 @@ module.exports = React.createClass({ ChannelStore.addChangeListener(this.onChange); UserStore.addChangeListener(this.onChange); UserStore.addStatusesChangeListener(this.onChange); + TeamStore.addChangeListener(this.onChange); SocketStore.addChangeListener(this.onSocketChange); $('.nav-pills__container').perfectScrollbar(); @@ -146,6 +147,7 @@ module.exports = React.createClass({ ChannelStore.removeChangeListener(this.onChange); UserStore.removeChangeListener(this.onChange); UserStore.removeStatusesChangeListener(this.onChange); + TeamStore.removeChangeListener(this.onChange); SocketStore.removeChangeListener(this.onSocketChange); }, onChange: function() { @@ -348,15 +350,16 @@ module.exports = React.createClass({ // set up click handler to switch channels (or create a new channel for non-existant ones) var clickHandler = null; - var href; + var href = '#'; + var teamURL = TeamStore.getCurrentTeamUrl(); if (!channel.fake) { clickHandler = function(e) { e.preventDefault(); utils.switchChannel(channel); }; - href = '#'; - } else { - href = TeamStore.getCurrentTeamUrl() + '/channels/' + channel.name; + } + if (channel.fake && teamURL){ + href = teamURL + '/channels/' + channel.name; } return ( |