diff options
Diffstat (limited to 'webapp/routes/route_team.jsx')
-rw-r--r-- | webapp/routes/route_team.jsx | 42 |
1 files changed, 1 insertions, 41 deletions
diff --git a/webapp/routes/route_team.jsx b/webapp/routes/route_team.jsx index 1b4e48a51..e63be5a5e 100644 --- a/webapp/routes/route_team.jsx +++ b/webapp/routes/route_team.jsx @@ -58,7 +58,6 @@ function preNeedsTeam(nextState, replace, callback) { // for the current url. const teamName = nextState.params.team; var team = TeamStore.getByName(teamName); - const oldTeamId = TeamStore.getCurrentId(); if (!team) { browserHistory.push('/'); @@ -70,15 +69,7 @@ function preNeedsTeam(nextState, replace, callback) { TeamStore.saveMyTeam(team); TeamStore.emitChange(); - // If the old team id is null then we will already have the direct - // profiles from initial load - if (oldTeamId != null) { - AsyncClient.getDirectProfiles(); - } - var d1 = $.Deferred(); //eslint-disable-line new-cap - var d2 = $.Deferred(); //eslint-disable-line new-cap - var d3 = $.Deferred(); //eslint-disable-line new-cap Client.getChannels( (data) => { @@ -96,38 +87,7 @@ function preNeedsTeam(nextState, replace, callback) { } ); - Client.getProfiles( - (data) => { - AppDispatcher.handleServerAction({ - type: ActionTypes.RECEIVED_PROFILES, - profiles: data - }); - - d2.resolve(); - }, - (err) => { - AsyncClient.dispatchError(err, 'getProfiles'); - d2.resolve(); - } - ); - - Client.getTeamMembers( - TeamStore.getCurrentId(), - (data) => { - AppDispatcher.handleServerAction({ - type: ActionTypes.RECEIVED_MEMBERS_FOR_TEAM, - team_members: data - }); - - d3.resolve(); - }, - (err) => { - AsyncClient.dispatchError(err, 'getTeamMembers'); - d3.resolve(); - } - ); - - $.when(d1, d2, d3).done(() => { + $.when(d1).done(() => { callback(); }); } |