diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-07-29 12:55:31 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-07-29 12:55:31 -0400 |
| commit | 99138954232ed2d471d8bedd7377db5a7e74fc4a (patch) | |
| tree | 620287028b6936c1bdc1229e0b871e2e8202c49b /web/react/components/signup_team_complete.jsx | |
| parent | be5470c42298d59bfc3828510aa3d57e28adae9a (diff) | |
| parent | 2775225e0dba77ab2c47286d5c225575cadc8834 (diff) | |
| download | chat-99138954232ed2d471d8bedd7377db5a7e74fc4a.tar.gz chat-99138954232ed2d471d8bedd7377db5a7e74fc4a.tar.bz2 chat-99138954232ed2d471d8bedd7377db5a7e74fc4a.zip | |
Merge pull request #259 from nickago/MM-1683
MM-1683 Removed a vestigial wait condition from the signup process.
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 e7b37ef39..55845fc26 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 = 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) + // ); }.bind(this), function(err) { this.setState({server_error: err.message}); |