diff options
author | Antti Ahti <antti.ahti@gmail.com> | 2015-10-15 08:54:20 +0300 |
---|---|---|
committer | Antti Ahti <antti.ahti@gmail.com> | 2015-10-15 08:54:20 +0300 |
commit | c0809bbc3fc7a9630659872850c313eb6df701d9 (patch) | |
tree | 44b18d0f1fa4bbda97ce94f9872eb15f6794c6ac | |
parent | 059df3de0126f2a506b525f92911035eba02bbd3 (diff) | |
download | chat-c0809bbc3fc7a9630659872850c313eb6df701d9.tar.gz chat-c0809bbc3fc7a9630659872850c313eb6df701d9.tar.bz2 chat-c0809bbc3fc7a9630659872850c313eb6df701d9.zip |
Treat teams as an array instead of object
-rw-r--r-- | web/react/components/navbar_dropdown.jsx | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/web/react/components/navbar_dropdown.jsx b/web/react/components/navbar_dropdown.jsx index d4308ad72..564a64f48 100644 --- a/web/react/components/navbar_dropdown.jsx +++ b/web/react/components/navbar_dropdown.jsx @@ -163,7 +163,7 @@ export default class NavbarDropdown extends React.Component { var teams = []; - if (Object.keys(this.state.teams).length > 1) { + if (this.state.teams.length > 1) { teams.push( <li className='divider' @@ -172,14 +172,11 @@ export default class NavbarDropdown extends React.Component { </li> ); - for (let teamId in this.state.teams) { - if (this.state.teams.hasOwnProperty(teamId)) { - let team = this.state.teams[teamId]; - if (team.name !== this.props.teamName) { - teams.push(<li key={team.name}><a href={Utils.getWindowLocationOrigin() + '/' + team.name}>{'Switch to ' + team.display_name}</a></li>); - } + this.state.teams.forEach((team) => { + if (team.name !== this.props.teamName) { + teams.push(<li key={team.name}><a href={Utils.getWindowLocationOrigin() + '/' + team.name}>{'Switch to ' + team.display_name}</a></li>); } - } + }); } if (global.window.config.EnableTeamCreation === 'true') { |