IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-08-26 21:27:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #259 from nickago/MM-1683

Browse Source 
MM-1683 Removed a vestigial wait condition from the signup process.
This commit is contained in:
Christopher Speller
2015-07-29 12:55:31 -04:00
parent be5470c422 2775225e0d
commit 9913895423
1 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/react/components/signup_team_complete.jsx
+15 -17
View File
@@ -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);
$('#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);
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);
// 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});