Disable validations on form inputs with "disableClientSideValidations"

fgrehm · Nov 19, 2012 · 231f06f · 231f06f
1 parent 8340189
commit 231f06f
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 11 deletions.
diff --git a/coffeescript/rails.validations.coffee b/coffeescript/rails.validations.coffee
@@ -112,7 +112,6 @@ window.ClientSideValidations.selectors =
 window.ClientSideValidations.reset = (form) ->
   $form = $(form)
   ClientSideValidations.disable(form)
-  ClientSideValidations.disable($form.find(':input'))
   for key of form.ClientSideValidations.settings.validators
     form.ClientSideValidations.removeError($form.find("[name='#{key}']"))
 
@@ -121,10 +120,13 @@ window.ClientSideValidations.reset = (form) ->
 window.ClientSideValidations.disable = (target) ->
   $target = $(target)
   $target.off('.ClientSideValidations')
-  $target.removeData('valid')
-  $target.removeData('changed')
-  $target.filter(':input').each ->
-    $(@).removeAttr('data-validate')
+  if $target.is('form')
+    ClientSideValidations.disable($target.find(':input'))
+  else
+    $target.removeData('valid')
+    $target.removeData('changed')
+    $target.filter(':input').each ->
+      $(@).removeAttr('data-validate')
 
 window.ClientSideValidations.enablers =
   form: (form) ->

diff --git a/test/javascript/public/test/form_builders/validateForm.js b/test/javascript/public/test/form_builders/validateForm.js
@@ -107,6 +107,19 @@ test('Resetting client side validations', 9, function() {
   ok(input.parent().find('label:contains("must be present")')[0]);
 });
 
+test('Disable client side validations on all child inputs', 3, function() {
+  var form = $('form#new_user'), input = form.find('input#user_name');
+  var label = $('label[for="user_name"]');
+
+  form.disableClientSideValidations();
+
+  input.trigger('focusout');
+
+  ok(!input.parent().hasClass('field_with_errors'));
+  ok(!label.parent().hasClass('field_with_errors'));
+  ok(!input.parent().find('label:contains("must be present")')[0]);
+});
+
 asyncTest('Handle disable-with', 1, function() {
   var form = $('form#new_user'), input = form.find('input#user_name');
   var label = $('label[for="user_name"]');

diff --git a/vendor/assets/javascripts/rails.validations.js b/vendor/assets/javascripts/rails.validations.js