improve data-dependent-validation in form-validators

aFarkas · Jan 15, 2014 · 7f670cf · 7f670cf
1 parent bb2ddb5
commit 7f670cf
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/shims/form-validators.js b/src/shims/form-validators.js
@@ -32,7 +32,7 @@ webshims.register('form-validators', function($, webshims, window, document, und
 			webshims.customErrorMessages[name][''] = defaultMessage || name;
 		}
 		if(formReady){
-			$('input, select, textarea')
+			$('input, select, textarea, fieldset[data-dependent-validation]')
 				.filter(noValidate)
 				.each(function(){
 					testValidityRules(this);
@@ -42,7 +42,7 @@ webshims.register('form-validators', function($, webshims, window, document, und
 	};
 	webshims.refreshCustomValidityRules = function(elem){
 		if(!initTest){return;}
-
+		var val;
 		var data = $(elem).data() || $.data(elem, {});
 		var customMismatchedRule = data.customMismatchedRule;
 		var validity = $.prop(elem, 'validity') || {};
@@ -76,14 +76,18 @@ webshims.register('form-validators', function($, webshims, window, document, und
 			blockCustom = false;
 		};
 		if(customMismatchedRule || validity.valid || (data.dependentValidation && !data.dependentValidation._init)){
-			var val = $(elem).val();
+			val = $(elem).val();
 			$.each(customValidityRules, function(name, test){
 				message = test(elem, val, data, setMessage) || '';
 				customMismatchedRule = name;
 				if(message){
 					return false;
 				}
 			});
+
+			if(data.dependentValidation && !data.dependentValidation._init && !data.dependentValidation.masterElement){
+				customValidityRules.dependent(elem, val, data, $.noop);
+			}
 			if(message != 'async' && (message || !validity.valid)){
 				setMessage(message, customMismatchedRule);
 			}
@@ -107,7 +111,7 @@ webshims.register('form-validators', function($, webshims, window, document, und
 		setTimeout(function(){
 			webshims.addReady(function(context, selfElement){
 				initTest = true;
-				$('input, select, textarea', context).add(selfElement.filter('input, select, textarea'))
+				$('input, select, textarea, fieldset[data-dependent-validation]', context).add(selfElement.filter('input, select, textarea, fieldset[data-dependent-validation]'))
 					.filter(noValidate)
 					.each(function(){
 						testValidityRules(this);
@@ -236,7 +240,7 @@ webshims.register('form-validators', function($, webshims, window, document, und
 
 
 			data.masterElement = document.getElementById(data["from"]) || (document.getElementsByName(data["from"] || [])[0]);
-
+			data._init = true;
 			if (!data.masterElement || !data.masterElement.form) {return;}
 
 			if(/radio|checkbox/i.test(data.masterElement.type)){