Do not validate dynamically disabled inputs

DavyJonesLocker · May 1, 2020 · 42c6412 · 42c6412
1 parent ff2abef
commit 42c6412
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@
 * [FEATURE] Do not require `jquery-rails` gem ([#785](https://github.com/DavyJonesLocker/client_side_validations/pull/785))
 * [FEATURE] Add support for many association validations ([#783](https://github.com/DavyJonesLocker/client_side_validations/pull/783))
 * [BUGFIX] Fix Rails generators ([#786](https://github.com/DavyJonesLocker/client_side_validations/pull/786))
+* [BUGFIX] Do not validate dynamically disabled inputs ([#789](https://github.com/DavyJonesLocker/client_side_validations/pull/789))
 
 ## 16.2.0 / 2020-04-10
 

diff --git a/dist/client-side-validations.esm.js b/dist/client-side-validations.esm.js
@@ -720,7 +720,7 @@ var isMarkedForDestroy = function isMarkedForDestroy(element) {
 };
 
 var executeAllValidators = function executeAllValidators(element, validators) {
-  if (element.data('changed') === false) {
+  if (element.data('changed') === false || element.prop('disabled')) {
     return;
   }
 

diff --git a/dist/client-side-validations.js b/dist/client-side-validations.js
@@ -726,7 +726,7 @@
   };
 
   var executeAllValidators = function executeAllValidators(element, validators) {
-    if (element.data('changed') === false) {
+    if (element.data('changed') === false || element.prop('disabled')) {
       return;
     }
 

diff --git a/src/main.js b/src/main.js
@@ -180,7 +180,7 @@ const isMarkedForDestroy = (element) => {
 }
 
 const executeAllValidators = (element, validators) => {
-  if (element.data('changed') === false) {
+  if (element.data('changed') === false || element.prop('disabled')) {
     return
   }
 

diff --git a/test/javascript/public/test/validateElement.js b/test/javascript/public/test/validateElement.js
@@ -398,10 +398,11 @@ QUnit.test("Don't validate dynamically disabled inputs", function (assert) {
       input_tag: '<div class="field_with_errors"><span id="input_tag"></span><label for="user_name" class="message"></label></div>',
       label_tag: '<div class="field_with_errors"><label id="label_tag"></label></div>'
     },
-    validators: { 'user_2[name]': { presence: { message: 'must be present' } } }
+    validators: { 'user_2[name]': { presence: [{ message: 'must be present' }] } }
   }
 
   $('#qunit-fixture')
+    .html('')
     .append($('<form>', {
       action: '/users',
       'data-client-side-validations': JSON.stringify(dataCsv),
@@ -422,6 +423,7 @@ QUnit.test("Don't validate dynamically disabled inputs", function (assert) {
   input.attr('disabled', 'disabled')
   input.val('')
   input.trigger('focusout')
+
   assert.notOk(input.parent().hasClass('field_with_errors'))
 })
 

diff --git a/vendor/assets/javascripts/rails.validations.js b/vendor/assets/javascripts/rails.validations.js
@@ -726,7 +726,7 @@
   };
 
   var executeAllValidators = function executeAllValidators(element, validators) {
-    if (element.data('changed') === false) {
+    if (element.data('changed') === false || element.prop('disabled')) {
       return;
     }