diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2015-10-05 16:02:09 -0400 |
---|---|---|
committer | Harrison Healey <harrisonmhealey@gmail.com> | 2015-10-05 16:02:09 -0400 |
commit | e2e00d9d43c14806cd5a5c424b9879636dfd89c8 (patch) | |
tree | 607e55539a4827382bfdc331400885fdd073922c /web/react/components/sidebar.jsx | |
parent | 193732ffbf1107fd146412ce38a053354d972e25 (diff) | |
parent | 33b957ed1a8a44d4bed0f9c674d5602bad5028ea (diff) | |
download | chat-e2e00d9d43c14806cd5a5c424b9879636dfd89c8.tar.gz chat-e2e00d9d43c14806cd5a5c424b9879636dfd89c8.tar.bz2 chat-e2e00d9d43c14806cd5a5c424b9879636dfd89c8.zip |
Merge pull request #922 from mattermost/plt-360
PLT-360 Upgrade and changes to ESLint
Diffstat (limited to 'web/react/components/sidebar.jsx')
-rw-r--r-- | web/react/components/sidebar.jsx | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx index c0841a508..b696f4b53 100644 --- a/web/react/components/sidebar.jsx +++ b/web/react/components/sidebar.jsx @@ -29,9 +29,11 @@ export default class Sidebar extends React.Component { this.updateUnreadIndicators = this.updateUnreadIndicators.bind(this); this.createChannelElement = this.createChannelElement.bind(this); - this.state = this.getStateFromStores(); - this.state.modal = ''; - this.state.loadingDMChannel = -1; + const state = this.getStateFromStores(); + state.modal = ''; + state.loadingDMChannel = -1; + + this.state = state; } getStateFromStores() { var members = ChannelStore.getAllMembers(); @@ -65,7 +67,18 @@ export default class Sidebar extends React.Component { var channel = ChannelStore.getByName(channelName); - if (channel != null) { + if (channel == null) { + var tempChannel = {}; + tempChannel.fake = true; + tempChannel.name = channelName; + tempChannel.display_name = teammate.username; + tempChannel.teammate_username = teammate.username; + tempChannel.status = UserStore.getStatus(teammate.id); + tempChannel.last_post_at = 0; + tempChannel.total_msg_count = 0; + tempChannel.type = 'D'; + readDirectChannels.push(tempChannel); + } else { channel.display_name = teammate.username; channel.teammate_username = teammate.username; @@ -80,17 +93,6 @@ export default class Sidebar extends React.Component { } else { readDirectChannels.push(channel); } - } else { - var tempChannel = {}; - tempChannel.fake = true; - tempChannel.name = channelName; - tempChannel.display_name = teammate.username; - tempChannel.teammate_username = teammate.username; - tempChannel.status = UserStore.getStatus(teammate.id); - tempChannel.last_post_at = 0; - tempChannel.total_msg_count = 0; - tempChannel.type = 'D'; - readDirectChannels.push(tempChannel); } } |