From 7b776fbb781e89670273283e82614aa9c5954040 Mon Sep 17 00:00:00 2001
From: nickago <ngonella@calpoly.edu>
Date: Mon, 27 Jul 2015 14:29:49 -0700
Subject: Removed timeout originally set on team creation

---
 web/react/components/signup_team_complete.jsx | 36 +++++++++++++--------------
 1 file changed, 17 insertions(+), 19 deletions(-)

(limited to 'web/react/components/signup_team_complete.jsx')

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});
-- 
cgit v1.2.3-1-g7c22

