Skip to content

Patch for https://github.com/meteor-useraccounts/core/issues/249 #252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
splendido merged 1 commit into from
Jan 25, 2015
Merged

Patch for https://github.com/meteor-useraccounts/core/issues/249 #252

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 32 additions & 21 deletions lib/templates_helpers/at_pwd_form.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,30 +150,41 @@ AT.prototype.atPwdFormEvents = {
}, function(error){
AccountsTemplates.submitCallback(error, undefined, function(){
if (AccountsTemplates.options.sendVerificationEmail && AccountsTemplates.options.enforceEmailVerification){
AccountsTemplates.state.form.set("result", AccountsTemplates.texts.info.signUpVerifyEmail);
// Cleans up input fields' content
_.each(AccountsTemplates.getFields(), function(field){
// Considers only visible fields...
if (!_.contains(field.visible, state))
return;
var fieldId = field._id;
t.$("#at-field-" + fieldId).val("");
AccountsTemplates.submitCallback(error, state, function () {
AccountsTemplates.state.form.set("result", AccountsTemplates.texts.info.signUpVerifyEmail);
// Cleans up input fields' content
_.each(AccountsTemplates.getFields(), function(field){
// Considers only visible fields...
if (!_.contains(field.visible, state))
return;

var elem = t.$("#at-field-" + field._id);

// Naïve reset
if (field.type === "checkbox") elem.prop('checked', false);
else elem.val("");

});
AccountsTemplates.setDisabled(false);
AccountsTemplates.avoidRedirect = true;
});
AccountsTemplates.setDisabled(false);
return;
}
var loginSelector;
if (email)
loginSelector = {email: email};
else if (username)
loginSelector = {username: username};
else
loginSelector = username_and_email;
Meteor.loginWithPassword(loginSelector, password, function(error) {
AccountsTemplates.submitCallback(error, state, function(){
AccountsTemplates.setState("signIn");
else {
var loginSelector;

if (email)
loginSelector = {email: email};
else if (username)
loginSelector = {username: username};
else
loginSelector = username_and_email;

Meteor.loginWithPassword(loginSelector, password, function(error) {
AccountsTemplates.submitCallback(error, state, function(){
AccountsTemplates.setState("signIn");
});
});
});
}
});
});
}
Expand Down