Merge branch 'master' of https://github.com/running-coder/jquery-form-validation

running-coder · running-coder · commit 1c0e9de4ea01 · 2015-02-18T20:24:40.000-05:00
Conflicts:
	jquery.validation.js

Added NAME rule
diff --git a/demo/jquery.validation.css b/demo/jquery.validation.css
@@ -372,7 +372,8 @@ div.error,
 div.error-list,
 label.error,
 input.error,
-select.error {
+select.error,
+textarea.error {
     color: #D95C5C !important;
     border-color: #D95C5C !important;
 }
diff --git a/html5-form-validation.jquery.json b/html5-form-validation.jquery.json
@@ -9,7 +9,7 @@
         "validation",
         "input"
     ],
-    "version": "1.5.0",
+    "version": "1.5.1",
     "author": {
         "name": "Tom Bertrand",
         "url": "http://www.runningcoder.org/jqueryvalidation/"
diff --git a/jquery.validation.js b/jquery.validation.js
@@ -4,14 +4,13 @@
  * Licensed under the MIT license
  *
  * @author Tom Bertrand
- * @version 1.5.0 (2015-02-08)
+ * @version 1.5.1 (2015-02-16)
  * @link http://www.runningcoder.org/jqueryvalidation/
  *
  * @note
  * Remove debug code: //\s?\{debug\}[\s\S]*?\{/debug\}
  */
-;(function (window, document, $, undefined)
-{
+;(function (window, document, $, undefined) {
 
     window.Validation = {
         form: [],
@@ -23,7 +22,9 @@
      * Fail-safe preventExtensions function for older browsers
      */
     if (typeof Object.preventExtensions !== "function") {
-        Object.preventExtensions = function (obj) { return obj; };
+        Object.preventExtensions = function (obj) {
+            return obj;
+        };
     }
 
     // Not using strict to avoid throwing a window error on bad config extend.
@@ -38,8 +39,9 @@
     var _rules = {
         NOTEMPTY: /\S/,
         INTEGER: /^\d+$/,
-        NUMERIC: /^\d+(?:[,|\s]\d{3})?(?:\.\d+)?$/,
-        MIXED: /^['\w\s-]+$/,
+        NUMERIC: /^\d+(?:[,\s]\d{3})*(?:\.\d+)?$/,
+        MIXED: /^[\w\s-]+$/,
+        NAME: /^['a-z\s-]+$/i,
         NOSPACE: /^(?!\s)\S*$/,
         TRIM: /^[^\s].*[^\s]$/,
         DATE: /^\d{4}-\d{2}-\d{2}(\s\d{2}:\d{2}(:\d{2})?)?$/,
@@ -57,12 +59,12 @@
     _messages = {
         'default': '$ contain error(s).',
         'NOTEMPTY': '$ must not be empty.',
-        'NUMERIC': '$ must be numeric.',
         'INTEGER': '$ must be an integer.',
-        'STRING': '$ must be a string.',
+        'NUMERIC': '$ must be numeric.',
+        'MIXED': '$ must be letters or numbers (no special characters).',
+        'NAME': '$ must not contain special characters.',
         'NOSPACE': '$ must not contain spaces.',
         'TRIM': '$ must not start or end with space character.',
-        'MIXED': '$ must be letters or numbers (no special characters).',
         'DATE': '$ is not a valid with format YYYY-MM-DD.',
         'EMAIL': '$ is not valid.',
         'URL': '$ is not valid.',
@@ -185,7 +187,7 @@
         /**
          * Extends user-defined "options.message" into the default Validation "_message".
          */
-        function extendRules () {
+        function extendRules() {
             options.rules = $.extend(
                 true,
                 {},
@@ -197,7 +199,7 @@
         /**
          * Extends user-defined "options.message" into the default Validation "_message".
          */
-        function extendMessages () {
+        function extendMessages() {
             options.messages = $.extend(
                 true,
                 {},
@@ -212,7 +214,7 @@
          *  - preventExtensions prevents from modifying the Validation "_options" object structure
          *  - filter through the "_supported" to delete unsupported "options"
          */
-        function extendOptions () {
+        function extendOptions() {
 
             if (!(options instanceof Object)) {
                 options = {};
@@ -330,7 +332,7 @@
             });
             // {/debug}
 
-            if ( !node.find('[' + _data.validation + '],[' + _data.regex + ']')[0]) {
+            if (!node.find('[' + _data.validation + '],[' + _data.regex + ']')[0]) {
 
                 // {debug}
                 options.debug && window.Debug.log({
@@ -390,7 +392,7 @@
          * Delegates the submit validation on data-validation and data-validation-regex attributes based on trigger.
          * Note: Disable the form submit function so the callbacks are not by-passed
          */
-        function delegateValidation () {
+        function delegateValidation() {
 
             _executeCallback(options.submit.callback.onInit, [node]);
 
@@ -462,12 +464,12 @@
          *
          * @returns {boolean} true if no error(s) were found (valid form)
          */
-        function validateForm () {
+        function validateForm() {
 
             var isValid = true;
 
             $.each(
-                node.find('[' + _data.validation + ']:not([disabled]),[' + _data.regex + ']:not([disabled])'),
+                node.find('[' + _data.validation + ']:not([disabled],[readonly]),[' + _data.regex + ']:not([disabled],[readonly])'),
                 function (index, input) {
                     if (!validateInput(input)) {
                         isValid = false;
@@ -487,7 +489,7 @@
          *
          * @returns {boolean} true if no error(s) were found (valid input)
          */
-        function validateInput (input) {
+        function validateInput(input) {
 
             var inputName = $(input).attr('name');
 
@@ -529,7 +531,7 @@
             if (validationArray instanceof Array && validationArray.length > 0) {
 
                 // "OPTIONAL" input will not be validated if it's empty
-                if (value === '' && $.inArray('OPTIONAL', validationArray) !== -1) {
+                if (value === '' && ~validationArray.indexOf('OPTIONAL')) {
                     return true;
                 }
 
@@ -597,7 +599,7 @@
          *
          * @returns {*} Error if a mismatch occurred.
          */
-        function validateRule (value, rule, reversed) {
+        function validateRule(value, rule, reversed) {
 
             // Validate for "data-validation-regex" and "data-validation-regex-reverse"
             if (rule instanceof RegExp) {
@@ -716,7 +718,7 @@
          * @param {string} inputName Input where the error occurred
          * @param {string} error Description of the error to be displayed
          */
-        function registerError (inputName, error) {
+        function registerError(inputName, error) {
 
             if (!errors[inputName]) {
                 errors[inputName] = [];
@@ -747,7 +749,7 @@
          *
          * @returns {boolean} false if an unwanted behavior occurs
          */
-        function displayOneError (inputName) {
+        function displayOneError(inputName) {
 
             var input,
                 inputId,
@@ -859,15 +861,15 @@
                     }
                 }
 
-                input.unbind(event).on(event, function (a,b,c,d,e) {
+                input.unbind(event).on(event, function (a, b, c, d, e) {
 
                     return function () {
                         if (e) {
                             if ($(c).hasClass(options.submit.settings.errorClass)) {
-                                resetOneError(a,b,c,d,e);
+                                resetOneError(a, b, c, d, e);
                             }
                         } else if ($(b).hasClass(options.submit.settings.errorClass)) {
-                            resetOneError(a,b,c,d);
+                            resetOneError(a, b, c, d);
                         }
                     };
 
@@ -893,7 +895,7 @@
         /**
          * Display all of the errors
          */
-        function displayErrors () {
+        function displayErrors() {
 
             for (var inputName in errors) {
                 if (!errors.hasOwnProperty(inputName)) continue;
@@ -959,7 +961,7 @@
         /**
          * Remove all of the input error(s) display.
          */
-        function resetErrors () {
+        function resetErrors() {
 
             errors = [];
             window.Validation.hasScrolled = false;
@@ -975,7 +977,7 @@
          * - This function will be overridden if "options.submit.settings.onSubmit" is defined
          * - The node can't be submitted by jQuery since it has been disabled, use the form native submit function instead
          */
-        function submitForm () {
+        function submitForm() {
 
             node[0].submit()
 
@@ -986,7 +988,7 @@
          *
          * @returns {boolean}
          */
-        function destroy () {
+        function destroy() {
 
             resetErrors();
             node.find('[' + _data.validation + '],[' + _data.regex + ']').off(delegateSuffix + ' ' + resetSuffix);
@@ -1035,10 +1037,10 @@
          * Execute function once the timer is reached.
          * If the function is recalled before the timer ends, the first call will be canceled.
          */
-        var _typeWatch = (function(){
+        var _typeWatch = (function () {
             var timer = 0;
-            return function(callback, ms){
-                clearTimeout (timer);
+            return function (callback, ms) {
+                clearTimeout(timer);
                 timer = setTimeout(callback, ms);
             };
         })();
@@ -1288,7 +1290,7 @@
             rules = [rules];
         }
 
-        for (var i=0; i<rules.length; i++) {
+        for (var i = 0; i < rules.length; i++) {
             _api.alterValidationRules(rules[i]);
         }
 
@@ -1480,7 +1482,7 @@
                 return false;
             }
 
-            return node.each( function () {
+            return node.each(function () {
 
                 var $this = $(this),
                     validationData = $this.attr(_data.validation),
@@ -1521,7 +1523,7 @@
                 return false;
             }
 
-            return node.each( function () {
+            return node.each(function () {
 
                 var $this = $(this),
                     validationData = $this.attr(_data.validation),
@@ -1618,15 +1620,15 @@
                     error[inputName] = [error[inputName]];
                 }
 
-                input = $(node.selector).find('[name="'+ inputName + '"]');
+                input = $(node.selector).find('[name="' + inputName + '"]');
                 if (!input[0]) {
 
                     // {debug}
                     window.Debug.log({
                         'node': node,
                         'function': '$.addError()',
                         'arguments': JSON.stringify(inputName),
-                        'message': 'ERROR - Unable to find ' + '$(' + node.selector + ').find("[name="'+ inputName + '"]")'
+                        'message': 'ERROR - Unable to find ' + '$(' + node.selector + ').find("[name="' + inputName + '"]")'
                     });
 
                     window.Debug.print();
@@ -1731,15 +1733,15 @@
             var input;
             for (var i = 0; i < inputName.length; i++) {
 
-                input = $(node.selector).find('[name="'+ inputName[i] + '"]');
+                input = $(node.selector).find('[name="' + inputName[i] + '"]');
                 if (!input[0]) {
 
                     // {debug}
                     window.Debug.log({
                         'node': node,
                         'function': '$.removeError()',
                         'arguments': JSON.stringify(inputName[i]),
-                        'message': 'ERROR - Unable to find ' + '$(' + node.selector + ').find("[name="'+ inputName[i] + '"]")'
+                        'message': 'ERROR - Unable to find ' + '$(' + node.selector + ').find("[name="' + inputName[i] + '"]")'
                     });
 
                     window.Debug.print();
@@ -1912,7 +1914,7 @@
                     console.table(this.table);
                 } else {
                     $.each(this.table, function (index, data) {
-                        console.log(data['Name'] + ': ' + data['Execution Time']+'ms');
+                        console.log(data['Name'] + ': ' + data['Execution Time'] + 'ms');
                     });
                 }
 
@@ -1929,34 +1931,25 @@
     };
     // {/debug}
 
-    String.prototype.capitalize = function() {
+    String.prototype.capitalize = function () {
         return this.charAt(0).toUpperCase() + this.slice(1);
     };
 
     if (!Array.prototype.indexOf) {
-        Array.prototype.indexOf = function(searchElement, fromIndex) {
-            var k;
-            if (this == null) {
-                throw new TypeError('"this" is null or not defined');
-            }
-            var O = Object(this);
-            var len = O.length >>> 0;
-            if (len === 0) {
-                return -1;
-            }
-            var n = +fromIndex || 0;
-            if (Math.abs(n) === Infinity) {
-                n = 0;
-            }
-            if (n >= len) {
-                return -1;
-            }
-            k = Math.max(n >= 0 ? n : len - Math.abs(n), 0);
-            while (k < len) {
-                if (k in O && O[k] === searchElement) {
-                    return k;
-                }
-                k++;
+        Array.prototype.indexOf = function (elt /*, from*/) {
+            var len = this.length >>> 0;
+
+            var from = Number(arguments[1]) || 0;
+            from = (from < 0)
+                ? Math.ceil(from)
+                : Math.floor(from);
+            if (from < 0)
+                from += len;
+
+            for (; from < len; from++) {
+                if (from in this &&
+                    this[from] === elt)
+                    return from;
             }
             return -1;
         };
diff --git a/jquery.validation.min.js b/jquery.validation.min.js
