diff options
| author | nickago <ngonella@calpoly.edu> | 2015-07-27 14:29:49 -0700 |
|---|---|---|
| committer | nickago <ngonella@calpoly.edu> | 2015-07-29 08:27:37 -0700 |
| commit | 7b776fbb781e89670273283e82614aa9c5954040 (patch) | |
| tree | 8274a82261c009af168e62f98e6dfc178dba1f08 /web/react/components/signup_team_complete.jsx | |
| parent | 54265271fa16c624570ff89a26ae8596cf0fafc7 (diff) | |
| download | chat-7b776fbb781e89670273283e82614aa9c5954040.tar.gz chat-7b776fbb781e89670273283e82614aa9c5954040.tar.bz2 chat-7b776fbb781e89670273283e82614aa9c5954040.zip | |
Removed timeout originally set on team creation
Diffstat (limited to 'web/react/components/signup_team_complete.jsx')
| -rw-r--r-- | web/react/components/signup_team_complete.jsx | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/web/react/components/signup_team_complete.jsx b/web/react/components/signup_team_complete.jsx index 21f9edef1..238714502 100644 --- a/web/react/components/signup_team_complete.jsx +++ b/web/react/components/signup_team_complete.jsx @@ -587,25 +587,23 @@ PasswordPage = React.createClass({ var props = this.props; - setTimeout(function() { - $('#sign-up-button').button('reset'); - props.state.wizard = "finished"; - props.updateParent(props.state, true); - - window.location.href = utils.getWindowLocationOrigin() + '/' + props.state.team.name + '/login?email=' + encodeURIComponent(teamSignup.team.email); - - // client.loginByEmail(teamSignup.team.domain, teamSignup.team.email, teamSignup.user.password, - // function(data) { - // TeamStore.setLastName(teamSignup.team.domain); - // UserStore.setLastEmail(teamSignup.team.email); - // UserStore.setCurrentUser(data); - // window.location.href = '/channels/town-square'; - // }.bind(ctl), - // function(err) { - // this.setState({name_error: err.message}); - // }.bind(ctl) - // ); - }, 5000); + $('#sign-up-button').button('reset'); + props.state.wizard = "finished"; + props.updateParent(props.state, true); + + window.location.href = window.location.origin + '/' + props.state.team.name + '/login?email=' + encodeURIComponent(teamSignup.team.email); + + // client.loginByEmail(teamSignup.team.domain, teamSignup.team.email, teamSignup.user.password, + // function(data) { + // TeamStore.setLastName(teamSignup.team.domain); + // UserStore.setLastEmail(teamSignup.team.email); + // UserStore.setCurrentUser(data); + // window.location.href = '/channels/town-square'; + // }.bind(ctl), + // function(err) { + // this.setState({name_error: err.message}); + // }.bind(ctl) + // ); }.bind(this), function(err) { this.setState({server_error: err.message}); |