Fix for finding errorElement with multiple classes

DavyJonesLocker · Mar 29, 2016 · 399f389 · 399f389
1 parent 0e01588
commit 399f389
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/coffeescript/rails.validations.simple_form.coffee b/coffeescript/rails.validations.simple_form.coffee
@@ -14,15 +14,15 @@ ClientSideValidations.formBuilders['SimpleForm::FormBuilder'] =
     default:
       add: (element, settings, message) ->
         wrapper = element.closest("#{settings.wrapper_tag}.#{settings.wrapper_class.replace(/\ /g, '.')}")
-        errorElement = wrapper.find("#{settings.error_tag}.#{settings.error_class}")
+        errorElement = wrapper.find("#{settings.error_tag}.#{settings.error_class.replace(/\ /g, '.')}")
         unless errorElement.length
           errorElement = $("<#{settings.error_tag}/>", { class: settings.error_class, text: message })
           wrapper.append(errorElement)
         wrapper.addClass(settings.wrapper_error_class)
         errorElement.text(message)
       remove: (element, settings) ->
         wrapper = element.closest("#{settings.wrapper_tag}.#{settings.wrapper_class.replace(/\ /g, '.')}.#{settings.wrapper_error_class}")
-        errorElement = wrapper.find("#{settings.error_tag}.#{settings.error_class}")
+        errorElement = wrapper.find("#{settings.error_tag}.#{settings.error_class.replace(/\ /g, '.')}")
         wrapper.removeClass(settings.wrapper_error_class)
         errorElement.remove()
 

diff --git a/test/javascript/public/test/form_builders/validateSimpleForm.js b/test/javascript/public/test/form_builders/validateSimpleForm.js
@@ -2,7 +2,7 @@ module('Validate SimpleForm', {
   setup: function() {
     window.ClientSideValidations.forms['new_user'] = {
       type: 'SimpleForm::FormBuilder',
-      error_class: 'error',
+      error_class: 'error small',
       error_tag: 'span',
       wrapper_error_class: 'field_with_errors',
       wrapper_tag: 'div',

diff --git a/vendor/assets/javascripts/rails.validations.simple_form.js b/vendor/assets/javascripts/rails.validations.simple_form.js
@@ -18,7 +18,7 @@
         add: function(element, settings, message) {
           var errorElement, wrapper;
           wrapper = element.closest(settings.wrapper_tag + "." + (settings.wrapper_class.replace(/\ /g, '.')));
-          errorElement = wrapper.find(settings.error_tag + "." + settings.error_class);
+          errorElement = wrapper.find(settings.error_tag + "." + (settings.error_class.replace(/\ /g, '.')));
           if (!errorElement.length) {
             errorElement = $("<" + settings.error_tag + "/>", {
               "class": settings.error_class,
@@ -32,7 +32,7 @@
         remove: function(element, settings) {
           var errorElement, wrapper;
           wrapper = element.closest(settings.wrapper_tag + "." + (settings.wrapper_class.replace(/\ /g, '.')) + "." + settings.wrapper_error_class);
-          errorElement = wrapper.find(settings.error_tag + "." + settings.error_class);
+          errorElement = wrapper.find(settings.error_tag + "." + (settings.error_class.replace(/\ /g, '.')));
           wrapper.removeClass(settings.wrapper_error_class);
           return errorElement.remove();
         }