[behavior.formvalidator] - pattern attribute behaviour fix (#19771)

* [behavior.formvalidator] - pattern behaviour fix * minify
joomla · Mar 17, 2018 · 3e436e0 · 3e436e0
1 parent 9d927c1
commit 3e436e0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/media/system/js/validate-uncompressed.js b/media/system/js/validate-uncompressed.js
@@ -86,14 +86,17 @@ var JFormValidator = function() {
 
 		// Try HTML5 pattern first then the handlers
 	    if ($el.attr('pattern') && $el.attr('pattern') != '') {
-		    if ($el.val().length) {
-			    isValid = new RegExp('^'+$el.attr('pattern')+'$').test($el.val());
-			    handleResponse(isValid, $el);
-			    return isValid;
-		    } else {
-			    handleResponse(false, $el);
-			    return false;
-		    }
+		if ($el.val().length) {
+			isValid = new RegExp('^'+$el.attr('pattern')+'$').test($el.val());
+			handleResponse(isValid, $el);
+			return isValid;					
+		}
+		if ($el.attr('required') || $el.hasClass('required')) {
+			handleResponse(false, $el);
+			return false;
+		}
+		handleResponse(true, $el);
+		return true;
 	    } else {
 		    if (handler === '') {
 			    handleResponse(true, $el);

diff --git a/media/system/js/validate.js b/media/system/js/validate.js