diff options
Diffstat (limited to 'www/js/views')
| -rw-r--r-- | www/js/views/login.js | 2 | ||||
| -rw-r--r-- | www/js/views/submit.js | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/www/js/views/login.js b/www/js/views/login.js index 93a9a5b..9225c18 100644 --- a/www/js/views/login.js +++ b/www/js/views/login.js @@ -78,7 +78,7 @@ if ( !$('#form_password').val() ) { isValid = 0; - this.validationError('form_password', FMS.validationStrings.password ); + this.validationError('form_password', FMS.validationStrings.password.required); } var email = $('#form_email').val(); diff --git a/www/js/views/submit.js b/www/js/views/submit.js index f24f21c..99f2d9b 100644 --- a/www/js/views/submit.js +++ b/www/js/views/submit.js @@ -340,11 +340,16 @@ }, validate: function() { + this.clearValidationErrors(); var isValid = 1; if ( !$('#form_password').val() ) { isValid = 0; - this.validationError('form_password', FMS.validationStrings.password ); + this.validationError('form_password', FMS.validationStrings.password.required ); + } else if ( CONFIG.PASSWORD_MIN_LENGTH && $('#form_password').val().length < CONFIG.PASSWORD_MIN_LENGTH ) { + isValid = 0; + var msg = FMS.validationStrings.password.short.replace('%d', CONFIG.PASSWORD_MIN_LENGTH); + this.validationError('form_password', msg); } if ($('#form_name').val() && !this.validateUserTitle()) { |