Fixes #14039, fixes #16636: Fixed validation for disabled inputs

This commit is contained in:
Evgeniy Moiseenko
2018-10-19 01:26:40 +03:00
committed by Alexander Makarov
parent 7c76696905
commit cfe0bf5cf1
4 changed files with 64 additions and 3 deletions

View File

@ -325,7 +325,7 @@
// client-side validation
$.each(data.attributes, function () {
this.$form = $form;
if (!$(this.input).is(":disabled")) {
if (!findInput($form, this).is(":disabled")) {
this.cancelled = false;
// perform validation only if the form is being submitted or if an attribute is pending validation
if (data.submitting || this.status === 2 || this.status === 3) {
@ -489,7 +489,6 @@
updateInput($(this), attribute, msg);
}
}
};
var watchAttribute = function ($form, attribute) {
@ -625,8 +624,9 @@
if (submitting) {
var errorAttributes = [];
var $input = findInput($form, this);
$.each(data.attributes, function () {
if (!$(this.input).is(":disabled") && !this.cancelled && updateInput($form, this, messages)) {
if (!$input.is(":disabled") && !this.cancelled && updateInput($form, this, messages)) {
errorAttributes.push(this);
}
});