implement data-errormessage json support for custom validity rules

ethanresnick · Jul 11, 2012 · 8e036cb · 8e036cb
1 parent 15ab9f2
commit 8e036cb
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 13 deletions.
diff --git a/demos/js-webshim/dev/extras/custom-validity.js b/demos/js-webshim/dev/extras/custom-validity.js
@@ -43,8 +43,13 @@
 				message = test(elem, val) || '';
 				customMismatchedRule = name;
 				if(message){
+
 					if(typeof message != 'string'){
-						message = elem.getAttribute('x-moz-errormessage') || elem.getAttribute('data-errormessage') || webshims.customErrorMessages[name][webshims.activeLang()] || webshims.customErrorMessages[name]['']; 
+						message = $(elem).data('errormessage') || elem.getAttribute('x-moz-errormessage') || webshims.customErrorMessages[name][webshims.activeLang()] || webshims.customErrorMessages[name]['']; 
+					}
+
+					if(typeof message == 'object'){
+						message = message[name] || message.customError || message.defaultMessage;
 					}
 					return false;
 				}
@@ -176,9 +181,14 @@
 		"toggle": false
 	};
 
-	var getGroupElements = $.webshims.modules && $.webshims.modules["form-core"].getGroupElements || function(elem) {
+	var getGroupElements = function(elem) {
 		return $(elem.form[elem.name]).filter('[type="radio"]');
 	};
+	$.webshims.ready('form-core', function(){
+		if($.webshims.modules){
+			getGroupElements = $.webshims.modules["form-core"].getGroupElements || getGroupElements;
+		}
+	});
 
 	addCustomValidityRule('dependent', function(elem, val){
 

diff --git a/demos/js-webshim/minified/extras/custom-validity.js b/demos/js-webshim/minified/extras/custom-validity.js
diff --git a/src/extras/custom-validity.js b/src/extras/custom-validity.js
@@ -43,8 +43,13 @@
 				message = test(elem, val) || '';
 				customMismatchedRule = name;
 				if(message){
+
 					if(typeof message != 'string'){
-						message = elem.getAttribute('x-moz-errormessage') || elem.getAttribute('data-errormessage') || webshims.customErrorMessages[name][webshims.activeLang()] || webshims.customErrorMessages[name]['']; 
+						message = $(elem).data('errormessage') || elem.getAttribute('x-moz-errormessage') || webshims.customErrorMessages[name][webshims.activeLang()] || webshims.customErrorMessages[name]['']; 
+					}
+
+					if(typeof message == 'object'){
+						message = message[name] || message.customError || message.defaultMessage;
 					}
 					return false;
 				}
@@ -176,9 +181,14 @@
 		"toggle": false
 	};
 
-	var getGroupElements = $.webshims.modules && $.webshims.modules["form-core"].getGroupElements || function(elem) {
+	var getGroupElements = function(elem) {
 		return $(elem.form[elem.name]).filter('[type="radio"]');
 	};
+	$.webshims.ready('form-core', function(){
+		if($.webshims.modules){
+			getGroupElements = $.webshims.modules["form-core"].getGroupElements || getGroupElements;
+		}
+	});
 
 	addCustomValidityRule('dependent', function(elem, val){