diff options
author | JoramWilander <jwawilander@gmail.com> | 2015-08-11 12:20:49 -0400 |
---|---|---|
committer | JoramWilander <jwawilander@gmail.com> | 2015-08-11 12:20:49 -0400 |
commit | 0178b178e50520f752b721ca71a94680e3b7b79b (patch) | |
tree | 0b67097d1cbde29dd99733033ab42e2614c89908 /web/react/components/sidebar.jsx | |
parent | f03e18280155b12ff78ffd57e843cfa70fe1a3eb (diff) | |
download | chat-0178b178e50520f752b721ca71a94680e3b7b79b.tar.gz chat-0178b178e50520f752b721ca71a94680e3b7b79b.tar.bz2 chat-0178b178e50520f752b721ca71a94680e3b7b79b.zip |
merge fix
Diffstat (limited to 'web/react/components/sidebar.jsx')
-rw-r--r-- | web/react/components/sidebar.jsx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx index fb282e680..80e3632c7 100644 --- a/web/react/components/sidebar.jsx +++ b/web/react/components/sidebar.jsx @@ -284,7 +284,7 @@ module.exports = React.createClass({ }, render: function() { var members = this.state.members; - var activeId = this.state.active_id; + var activeId = this.state.activeId; var badgesActive = false; // keep track of the first and last unread channels so we can use them to set the unread indicators @@ -296,7 +296,7 @@ module.exports = React.createClass({ var channelMember = members[channel.id]; var linkClass = ''; - if (channel.id === self.state.active_id) { + if (channel.id === activeId) { linkClass = 'active'; } |