From 572a3f668d376c27a6d29fa8cec65e8ee47c906d Mon Sep 17 00:00:00 2001 From: Yomi Colledge Date: Sat, 19 Jun 2010 18:10:39 +0100 Subject: [PATCH] Resolved issue with our validation markup not being hidden when it should be --- public/javascripts/form.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/public/javascripts/form.js b/public/javascripts/form.js index 5b799af6..5a888317 100644 --- a/public/javascripts/form.js +++ b/public/javascripts/form.js @@ -22,37 +22,37 @@ $(document).ready(function() { $.fn.customValidations = function(options) { var opts = $.extend({}, $.fn.animateIconPanel.defaults, options); - $(this).validate({ ignoreTitle: true, + focusInvalid: true, + clearFocus: true, + successClass: 'valid', + errorClass: 'error ui-state-error', + errorElement: "span", highlight: function(element, errorClass, validClass) { $(element).addClass(errorClass).removeClass(validClass); $(element).fadeOut(function() { var $parent = $(element).parent(); var $validElements = $parent.find('span.valid'); $validElements.remove(); - - $parent.addClass(errorClass).removeClass(validClass); - $(element).fadeIn(); }); }, unhighlight: function(element, errorClass, validClass) { var $parent = $(element).parent(); + var $validElements = $parent.find('span.error'); + $validElements.html(''); + $(element).removeClass(errorClass).addClass(validClass); + $validElements.removeClass(errorClass).addClass(validClass); $parent.removeClass(errorClass).addClass(validClass); }, success: function(label) { - console.log(label); var $parent = $(label).parent(); - // console.log($parent.find('span')); var $validElements = $parent.find('span.valid'); - $(label).html(); + $validElements.remove(); label.removeClass('error ui-state-error').addClass("valid"); }, - successClass: 'valid', - errorClass: 'error ui-state-error', - errorElement: "span", errorPlacement: function(error, element) { var $warningSpan = $('