diff --git a/lib/assets/javascripts/constants.js b/lib/assets/javascripts/constants.js index 6ce5d0c..bbeac41 100644 --- a/lib/assets/javascripts/constants.js +++ b/lib/assets/javascripts/constants.js @@ -1,5 +1,5 @@ (function(ctx){ - var vals = { + ctx = { PASSWORD_MIN_LENGTH: 8, PASSWORD_MAX_LENGTH: 128, @@ -8,8 +8,4 @@ VALIDATION_MESSAGE_REQUIRED: "This field is required.", VALIDATION_MESSAGE_PASSWORDS_MATCH: "The passwords must match." }; - - for(var key in vals){ - ctx[key] = ctx[key] || vals[key]; - } })(define('dmproadmap.constants')); diff --git a/lib/assets/javascripts/utils/ariatiseForm.js b/lib/assets/javascripts/utils/ariatiseForm.js index 69f571c..8bed57b 100644 --- a/lib/assets/javascripts/utils/ariatiseForm.js +++ b/lib/assets/javascripts/utils/ariatiseForm.js @@ -49,7 +49,7 @@ return $(selector).find('.form-control').filter('[data-validation],[aria-required="true"]'); }); var blockHelp=(function (id,type){ - return ''; + return ''; }); var ariaDescribedBy=(function(value){ return { 'aria-describedby': value }; @@ -57,12 +57,14 @@ var ariaInvalid=(function(value){ return { 'aria-invalid': value }; }); +/* var defaultValidationError=(function(type){ if(dmproadmap.utils.validate[type] && dmproadmap.utils.validate[type].message){ return dmproadmap.utils.validate[type].message; } return ''; }); +*/ var validationStates={ hasWarning: 'has-warning', hasError: 'has-error', @@ -100,9 +102,6 @@ $(el).next().hide(); }); var invalid=(function(el,msg){ - if(!msg){ - msg = defaultValidationError(getValidationTypeForElement(el)); - } $(el).parent().addClass(validationStates.hasError); $(el).attr(ariaInvalid(true)); $(el).next().text(msg).show();