diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2016-04-04 10:33:39 -0400 |
---|---|---|
committer | Harrison Healey <harrisonmhealey@gmail.com> | 2016-04-04 10:33:39 -0400 |
commit | ead8e64ccb42081272bca1a498a08c05825ce9d0 (patch) | |
tree | 8bbaed1fbe0aca6f3933b39421620158346f6237 /webapp/root.jsx | |
parent | c8987c326bf7222337232a193ff9a1680a53893c (diff) | |
parent | 35b63caafc912dae2200b5b6497ad059189c5048 (diff) | |
download | chat-ead8e64ccb42081272bca1a498a08c05825ce9d0.tar.gz chat-ead8e64ccb42081272bca1a498a08c05825ce9d0.tar.bz2 chat-ead8e64ccb42081272bca1a498a08c05825ce9d0.zip |
Merge pull request #2610 from mattermost/plt-2490
PLT-2490, PLT-2452 Fixing signup flow. Better root redirect. Fixes back buttons.
Diffstat (limited to 'webapp/root.jsx')
-rw-r--r-- | webapp/root.jsx | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/webapp/root.jsx b/webapp/root.jsx index da5980c33..417a13659 100644 --- a/webapp/root.jsx +++ b/webapp/root.jsx @@ -158,23 +158,6 @@ function preLoggedIn(nextState, replace, callback) { }); } -function onRootEnter(nextState, replace, callback) { - if (nextState.location.pathname === '/') { - Client.getMeLoggedIn((data) => { - if (!data || data.logged_in === 'false') { - replace({pathname: '/signup_team'}); - callback(); - } else { - replace({pathname: '/' + data.team_name + '/channels/town-square'}); - callback(); - } - }); - return; - } - - callback(); -} - function onPermalinkEnter(nextState) { const postId = nextState.params.postid; @@ -225,7 +208,6 @@ function renderRootComponent() { <Route path='/' component={Root} - onEnter={onRootEnter} > <Route path='error' @@ -332,7 +314,7 @@ function renderRootComponent() { component={TeamURLPage} /> <Route - path='invites' + path='send_invites' component={SendInivtesPage} /> <Route |