Skip to content
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

Jump to bottom

[Formvalidation] Input array validations should respect each single field on its own #387

Merged
merged 3 commits into from
Jan 22, 2019
Merged

[Formvalidation] Input array validations should respect each single field on its own #387

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c1422f2
fix(formvalidation): validate each found field with the same name to …
lubber-de Jan 11, 2019
04a182f
fix(formvalidation): show error class only on invalid fields, even at…
lubber-de Jan 12, 2019
59e8331
fix(formvalidation): keep old behavior for radiobutton, because there…
lubber-de Jan 12, 2019
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
61 changes: 42 additions & 19 deletions src/definitions/behaviors/form.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -704,7 +704,7 @@ $.fn.form = function(parameters) {
}
validation = $.extend({}, validation, newValidation);
},
prompt: function(identifier, errors) {
prompt: function(identifier, errors, internal) {
var
$field = module.get.field(identifier),
$fieldGroup = $field.closest($group),
Expand All @@ -716,9 +716,11 @@ $.fn.form = function(parameters) {
: errors
;
module.verbose('Adding field error state', identifier);
$fieldGroup
.addClass(className.error)
;
if(!internal) {
$fieldGroup
.addClass(className.error)
;
}
if(settings.inline) {
if(!promptExists) {
$prompt = settings.templates.prompt(errors);
Expand Down Expand Up @@ -997,11 +999,18 @@ $.fn.form = function(parameters) {
module.debug('Field depends on another value that is not present or empty. Skipping', $dependsField);
}
else if(field.rules !== undefined) {
$field.closest($group).removeClass(className.error);
$.each(field.rules, function(index, rule) {
if( module.has.field(identifier) && !( module.validate.rule(field, rule) ) ) {
module.debug('Field is invalid', identifier, rule.type);
fieldErrors.push(module.get.prompt(rule, field));
fieldValid = false;
if( module.has.field(identifier)) {
var invalidFields = module.validate.rule(field, rule,true) || [];
if (invalidFields.length>0){
module.debug('Field is invalid', identifier, rule.type);
fieldErrors.push(module.get.prompt(rule, field));
fieldValid = false;
if(showErrors){
$(invalidFields).closest($group).addClass(className.error);
}
}
}
});
}
Expand All @@ -1014,7 +1023,7 @@ $.fn.form = function(parameters) {
else {
if(showErrors) {
formErrors = formErrors.concat(fieldErrors);
module.add.prompt(identifier, fieldErrors);
module.add.prompt(identifier, fieldErrors, true);
settings.onInvalid.call($field, fieldErrors);
}
return false;
Expand All @@ -1023,26 +1032,40 @@ $.fn.form = function(parameters) {
},

// takes validation rule and returns whether field passes rule
rule: function(field, rule) {
rule: function(field, rule, internal) {
var
$field = module.get.field(field.identifier),
type = rule.type,
value = $field.val(),
isValid = true,
ancillary = module.get.ancillaryValue(rule),
ruleName = module.get.ruleName(rule),
ruleFunction = settings.rules[ruleName]
ruleFunction = settings.rules[ruleName],
invalidFields = [],
isValid = function(field){
var value = $(field).val();
// cast to string avoiding encoding special values
value = (value === undefined || value === '' || value === null)
? ''
: (settings.shouldTrim) ? $.trim(value + '') : String(value + '')
;
return ruleFunction.call(field, value, ancillary);
}
;
if( !$.isFunction(ruleFunction) ) {
module.error(error.noRule, ruleName);
return;
}
// cast to string avoiding encoding special values
value = (value === undefined || value === '' || value === null)
? ''
: (settings.shouldTrim) ? $.trim(value + '') : String(value + '')
;
return ruleFunction.call($field, value, ancillary);
if($field.is(selector.radio)) {
if (!isValid($field)) {
invalidFields = $field;
}
} else {
$.each($field, function (index, field) {
if (!isValid(field)) {
invalidFields.push(field);
}
});
}
return internal ? invalidFields : !(invalidFields.length>0);
}
},

Expand Down