v1.0.2

Moved pattern match error to the end to make sure other errors are caught first
tbb2 · Jun 8, 2017 · efb5fef · efb5fef
1 parent a56f278
commit efb5fef
Show file tree

Hide file tree

Showing 10 changed files with 44 additions and 44 deletions.
diff --git a/dist/js/validate.js b/dist/js/validate.js
@@ -1,5 +1,5 @@
 /*!
- * validate v1.0.1: A lightweight form validation script that augments native HTML5 form validation elements and attributes.
+ * validate v1.0.2: A lightweight form validation script that augments native HTML5 form validation elements and attributes.
  * (c) 2017 Chris Ferdinandi
  * MIT License
  * http://github.com/cferdinandi/validate
@@ -179,17 +179,6 @@
 		// If too long
 		if (validity.tooLong) return localSettings.messageTooLong.replace('{minLength}', field.getAttribute('maxLength')).replace('{length}', field.value.length);
 
-		// If pattern doesn't match
-		if (validity.patternMismatch) {
-
-			// If pattern info is included, return custom error
-			if (field.hasAttribute('title')) return field.getAttribute('title');
-
-			// Otherwise, generic error
-			return localSettings.messagePatternMismatch;
-
-		}
-
 		// If number input isn't a number
 		if (validity.badInput) return localSettings.messageBadInput;
 
@@ -202,6 +191,17 @@
 		// If a number field is below the min
 		if (validity.rangeUnderflow) return localSettings.messageRangeUnderflow.replace('{min}', field.getAttribute('min'));
 
+		// If pattern doesn't match
+		if (validity.patternMismatch) {
+
+			// If pattern info is included, return custom error
+			if (field.hasAttribute('title')) return field.getAttribute('title');
+
+			// Otherwise, generic error
+			return localSettings.messagePatternMismatch;
+
+		}
+
 		// If all else fails, return a generic catchall error
 		return localSettings.messageGeneric;
 

diff --git a/dist/js/validate.min.js b/dist/js/validate.min.js
diff --git a/dist/js/validityState-polyfill.js b/dist/js/validityState-polyfill.js
@@ -1,5 +1,5 @@
 /*!
- * validate v1.0.1: A lightweight form validation script that augments native HTML5 form validation elements and attributes.
+ * validate v1.0.2: A lightweight form validation script that augments native HTML5 form validation elements and attributes.
  * (c) 2017 Chris Ferdinandi
  * MIT License
  * http://github.com/cferdinandi/validate

diff --git a/dist/js/validityState-polyfill.min.js b/dist/js/validityState-polyfill.min.js
diff --git a/docs/dist/js/validate.js b/docs/dist/js/validate.js
@@ -1,5 +1,5 @@
 /*!
- * validate v1.0.1: A lightweight form validation script that augments native HTML5 form validation elements and attributes.
+ * validate v1.0.2: A lightweight form validation script that augments native HTML5 form validation elements and attributes.
  * (c) 2017 Chris Ferdinandi
  * MIT License
  * http://github.com/cferdinandi/validate
@@ -179,17 +179,6 @@
 		// If too long
 		if (validity.tooLong) return localSettings.messageTooLong.replace('{minLength}', field.getAttribute('maxLength')).replace('{length}', field.value.length);
 
-		// If pattern doesn't match
-		if (validity.patternMismatch) {
-
-			// If pattern info is included, return custom error
-			if (field.hasAttribute('title')) return field.getAttribute('title');
-
-			// Otherwise, generic error
-			return localSettings.messagePatternMismatch;
-
-		}
-
 		// If number input isn't a number
 		if (validity.badInput) return localSettings.messageBadInput;
 
@@ -202,6 +191,17 @@
 		// If a number field is below the min
 		if (validity.rangeUnderflow) return localSettings.messageRangeUnderflow.replace('{min}', field.getAttribute('min'));
 
+		// If pattern doesn't match
+		if (validity.patternMismatch) {
+
+			// If pattern info is included, return custom error
+			if (field.hasAttribute('title')) return field.getAttribute('title');
+
+			// Otherwise, generic error
+			return localSettings.messagePatternMismatch;
+
+		}
+
 		// If all else fails, return a generic catchall error
 		return localSettings.messageGeneric;