X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Roo%2Fbootstrap%2Fform%2FSecurePass.js;h=b8a8dee4c6de03ecb8fb04c1452b57ca7eff8de9;hb=09bb7277616beaf154ca84887611bc9879293382;hp=b75bc8dbb565f7c1970dd9a21eb814c5f295bc56;hpb=b360bfa62f23daffacee9f2e0154481baacd821f;p=roojs1 diff --git a/Roo/bootstrap/form/SecurePass.js b/Roo/bootstrap/form/SecurePass.js index b75bc8dbb5..b8a8dee4c6 100644 --- a/Roo/bootstrap/form/SecurePass.js +++ b/Roo/bootstrap/form/SecurePass.js @@ -9,6 +9,7 @@ * @class Roo.bootstrap.form.SecurePass * @extends Roo.bootstrap.form.Input * Bootstrap SecurePass class + * @cfg {Number} minimumStrength invalid if the strength of the password input is less than the minimum strength (from 0 to 3) (default 2) * * * @constructor @@ -17,63 +18,15 @@ */ Roo.bootstrap.form.SecurePass = function (config) { - // these go here, so the translation tool can replace them.. - this.errors = { - PwdEmpty: "Please type a password, and then retype it to confirm.", - PwdShort: "Your password must be at least 6 characters long. Please type a different password.", - PwdLong: "Your password can't contain more than 16 characters. Please type a different password.", - PwdBadChar: "The password contains characters that aren't allowed. Please type a different password.", - IDInPwd: "Your password can't include the part of your ID. Please type a different password.", - FNInPwd: "Your password can't contain your first name. Please type a different password.", - LNInPwd: "Your password can't contain your last name. Please type a different password.", - TooWeak: "Your password is Too Weak." - }, - this.meterLabel = "Password strength:"; - this.pwdStrengths = ["Too Weak", "Weak", "Medium", "Strong"]; - this.meterClass = [ - "roo-password-meter-tooweak", - "roo-password-meter-weak", - "roo-password-meter-medium", - "roo-password-meter-strong", - "roo-password-meter-grey" - ]; - - this.errors = {}; Roo.bootstrap.form.SecurePass.superclass.constructor.call(this, config); } Roo.extend(Roo.bootstrap.form.SecurePass, Roo.bootstrap.form.Input, { - /** - * @cfg {String/Object} errors A Error spec, or true for a default spec (defaults to - * { - * PwdEmpty: "Please type a password, and then retype it to confirm.", - * PwdShort: "Your password must be at least 6 characters long. Please type a different password.", - * PwdLong: "Your password can't contain more than 16 characters. Please type a different password.", - * PwdBadChar: "The password contains characters that aren't allowed. Please type a different password.", - * IDInPwd: "Your password can't include the part of your ID. Please type a different password.", - * FNInPwd: "Your password can't contain your first name. Please type a different password.", - * LNInPwd: "Your password can't contain your last name. Please type a different password." - * }) - */ + minimumStrength : 2, // private - - meterWidth: 300, - errorMsg :'', - errors: false, - imageRoot: '/', - /** - * @cfg {String/Object} Label for the strength meter (defaults to - * 'Password strength:') - */ - // private - meterLabel: '', - /** - * @cfg {String/Object} pwdStrengths A pwdStrengths spec, or true for a default spec (defaults to - * ['Weak', 'Medium', 'Strong']) - */ - // private - pwdStrengths: false, + meterWidth: 300, + imageRoot: '/', // private strength: 0, // private @@ -161,13 +114,13 @@ Roo.extend(Roo.bootstrap.form.SecurePass, Roo.bootstrap.form.Input, { //var pm = this.trigger.child('div/div/div').dom; var pm = this.trigger.child('div/div'); - pm.removeClass(this.meterClass); - pm.addClass(this.meterClass[strength]); + pm.removeClass(Roo.bootstrap.form.SecurePass.meterClass); + pm.addClass(Roo.bootstrap.form.SecurePass.meterClass[strength]); var pt = this.trigger.child('/div').child('>*[class=roo-password-meter-text]').dom; - pt.innerHTML = this.meterLabel + ' ' + this.pwdStrengths[strength]; + pt.innerHTML = Roo.bootstrap.form.SecurePass.meterLabel + ' ' + Roo.bootstrap.form.SecurePass.pwdStrengths[strength]; this._lastPwd = pwd; }, @@ -178,7 +131,7 @@ Roo.extend(Roo.bootstrap.form.SecurePass, Roo.bootstrap.form.Input, { this._lastPwd = ''; var pm = this.trigger.child('div/div'); - pm.removeClass(this.meterClass); + pm.removeClass(Roo.bootstrap.form.SecurePass.meterClass); pm.addClass('roo-password-meter-grey'); @@ -199,8 +152,7 @@ Roo.extend(Roo.bootstrap.form.SecurePass, Roo.bootstrap.form.Input, { return true; } - this.markInvalid(this.errors.PwdEmpty); - this.errorMsg = this.errors.PwdEmpty; + this.invalidText = Roo.bootstrap.form.SecurePass.errors.PwdEmpty; return false; } @@ -209,18 +161,15 @@ Roo.extend(Roo.bootstrap.form.SecurePass, Roo.bootstrap.form.Input, { } if (!value.match(/[\x21-\x7e]+/)) { - this.markInvalid(this.errors.PwdBadChar); - this.errorMsg = this.errors.PwdBadChar; + this.invalidText = Roo.bootstrap.form.SecurePass.errors.PwdBadChar; return false; } if (value.length < 6) { - this.markInvalid(this.errors.PwdShort); - this.errorMsg = this.errors.PwdShort; + this.invalidText = Roo.bootstrap.form.SecurePass.errors.PwdShort; return false; } if (value.length > 16) { - this.markInvalid(this.errors.PwdLong); - this.errorMsg = this.errors.PwdLong; + this.invalidText = Roo.bootstrap.form.SecurePass.errors.PwdLong; return false; } var strength; @@ -235,10 +184,9 @@ Roo.extend(Roo.bootstrap.form.SecurePass, Roo.bootstrap.form.Input, { } - if (strength < 2) { - //this.markInvalid(this.errors.TooWeak); - this.errorMsg = this.errors.TooWeak; - //return false; + if (strength < this.minimumStrength) { + this.invalidText = Roo.bootstrap.form.SecurePass.errors.TooWeak; + return false; } @@ -247,14 +195,13 @@ Roo.extend(Roo.bootstrap.form.SecurePass, Roo.bootstrap.form.Input, { //var pm = this.trigger.child('div/div/div').dom; var pm = this.trigger.child('div/div'); - pm.removeClass(this.meterClass); - pm.addClass(this.meterClass[strength]); + pm.removeClass(Roo.bootstrap.form.SecurePass.meterClass); + pm.addClass(Roo.bootstrap.form.SecurePass.meterClass[strength]); var pt = this.trigger.child('/div').child('>*[class=roo-password-meter-text]').dom; - pt.innerHTML = this.meterLabel + ' ' + this.pwdStrengths[strength]; - - this.errorMsg = ''; + pt.innerHTML = Roo.bootstrap.form.SecurePass.meterLabel + ' ' + Roo.bootstrap.form.SecurePass.pwdStrengths[strength]; + return true; }, // private @@ -351,4 +298,25 @@ Roo.extend(Roo.bootstrap.form.SecurePass, Roo.bootstrap.form.Input, { return this.IsLongEnough(pwd, 6) || !this.IsLongEnough(pwd, 0); } -}); \ No newline at end of file +}); + +Roo.bootstrap.form.SecurePass.errors = { + PwdEmpty: "Please type a password, and then retype it to confirm.", + PwdShort: "Your password must be at least 6 characters long. Please type a different password.", + PwdLong: "Your password can't contain more than 16 characters. Please type a different password.", + PwdBadChar: "The password contains characters that aren't allowed. Please type a different password.", + IDInPwd: "Your password can't include the part of your ID. Please type a different password.", + FNInPwd: "Your password can't contain your first name. Please type a different password.", + LNInPwd: "Your password can't contain your last name. Please type a different password.", + TooWeak: "Your password is Too Weak." +}; + +Roo.bootstrap.form.SecurePass.meterLabel = "Password strength:"; +Roo.bootstrap.form.SecurePass.pwdStrengths = ["Too Weak", "Weak", "Medium", "Strong"]; +Roo.bootstrap.form.SecurePass.meterClass = [ + "roo-password-meter-tooweak", + "roo-password-meter-weak", + "roo-password-meter-medium", + "roo-password-meter-strong", + "roo-password-meter-grey" +]; \ No newline at end of file