Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-01-06 22:40:14 -05:00
Code Issues Activity

Merge pull request #5775 from ErisDS/signin-validation

Browse source 
Add email validation back to signin
This commit is contained in:
Kevin Ansfield 2015-09-02 11:05:38 +01:00
commit e21b4b9f70
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/client/app/templates/signin.hbs
View file

@ -4,7 +4,7 @@
<form id="login" class="gh-signin" method="post" novalidate="novalidate">
{{#gh-form-group errors=model.errors hasValidated=hasValidated property="identification"}}
<span class="input-icon icon-mail">
{{gh-trim-focus-input class="gh-input email" type="email" placeholder="Email Address" name="identification" autocapitalize="off" autocorrect="off" tabindex="1" value=model.identification}}
{{gh-trim-focus-input class="gh-input email" type="email" placeholder="Email Address" name="identification" autocapitalize="off" autocorrect="off" tabindex="1" focusOut=(action "validate" "identification") value=model.identification}}
</span>
{{/gh-form-group}}
{{#gh-form-group errors=model.errors hasValidated=hasValidated property="password"}}

10
core/client/app/validators/signin.js
View file

@ -2,12 +2,13 @@ import BaseValidator from './base';
var SigninValidator = BaseValidator.create({
properties: ['identification', 'signin', 'forgotPassword'],
invalidMessage: 'Email address is not valid',
identification: function (model) {
var id = model.get('identification');
if (!validator.empty(id) && !validator.isEmail(id)) {
model.get('errors').add('identification', 'Invalid email');
model.get('errors').add('identification', this.get('invalidMessage'));
this.invalidate();
}
},
@ -23,6 +24,11 @@ var SigninValidator = BaseValidator.create({
this.invalidate();
}
if (!validator.empty(id) && !validator.isEmail(id)) {
model.get('errors').add('identification', this.get('invalidMessage'));
this.invalidate();
}
if (validator.empty(password)) {
model.get('errors').add('password', 'Please enter a password');
this.invalidate();
@ -35,7 +41,7 @@ var SigninValidator = BaseValidator.create({
model.get('errors').clear();
if (validator.empty(id) || !validator.isEmail(id)) {
model.get('errors').add('identification', 'Invalid email');
model.get('errors').add('identification', this.get('invalidMessage'));
this.invalidate();
}
}