vendor/assets/javascripts/webshims/shims/form-validators.js in webshims-rails-1.15.4 vs vendor/assets/javascripts/webshims/shims/form-validators.js in webshims-rails-1.15.5

@@ -183,23 +183,27 @@
 	};
 	var testValidityRules = webshims.refreshCustomValidityRules;
 
 
 	$('body').on('click', function(e){
+
 		if(e.target.type == 'submit' && !e.isDefaultPrevented()){
-			var activeElement, i, len;
-			var elements = $(e.target).jProp('form').prop('elements') || [];
+			var activeElement, i, len, elements;
+
 			try {
 				activeElement = document.activeElement;
-			} catch(e){}
+			} catch(er){}
 
+			if(!activeElement || activeElement == e.target){return;}
+			elements = $(e.target).jProp('form').prop('elements') || [];
+
+			if(activeElement && 'form' in activeElement && $.prop(activeElement, 'willValidate')){
+				$(activeElement).trigger('updatevalidation.webshims');
+			}
+
 			for(i = 0, len = elements.length; i < len; i++){
 				if($.data(elements[i], 'customMismatchedRule')){
-					if(activeElement == elements[i]){
-						$(elements[i]).trigger('updatevalidation.webshims');
-					} else {
-						testValidityRules(elements[i]);
-					}
+					testValidityRules(elements[i]);
 				}
 			}
 
 		}
 	});