diff --git a/app/sprinkles/core/assets/userfrosting/js/uf-jqueryvalidation-config.js b/app/sprinkles/core/assets/userfrosting/js/uf-jqueryvalidation-config.js index d29c87fa4..ebdd4e96a 100644 --- a/app/sprinkles/core/assets/userfrosting/js/uf-jqueryvalidation-config.js +++ b/app/sprinkles/core/assets/userfrosting/js/uf-jqueryvalidation-config.js @@ -31,8 +31,14 @@ jQuery.validator.setDefaults({ errorElement: 'p', errorClass: 'error-block', errorPlacement: function(error, element) { - if(element.parent('.input-group').length) { + if (element.hasClass('js-select2') && element.next('.select2-container').length) { + error.insertAfter(element.next('.select2-container')); + } else if (element.parent('.input-group').length) { error.insertAfter(element.parent()); + } else if (element.prop('type') === 'radio' && element.parent('.radio-inline').length) { + error.insertAfter(element.parent().parent()); + } else if (element.prop('type') === 'checkbox' || element.prop('type') === 'radio') { + error.appendTo(element.parent().parent()); } else { error.insertAfter(element); } @@ -46,4 +52,4 @@ jQuery.validator.setDefaults({ // Add a new check mark jQuery(element).after(''); } -}); +}); \ No newline at end of file