moved length validating functions into one

Author: victorjonsson

README.md

@@ -1,5 +1,5 @@
 
-**jQuery Form Validator* is a feature rich jQuery plugin that makes it easy to validate user input in HTML forsm
+**jQuery Form Validator** is a feature rich jQuery plugin that makes it easy to validate user input in HTML forsm
 while keeping the HTML code clean from javascript logic. Even though the plugin has **a wide range of validation functions**
 it's designed to consume as little bandwidth as possible (which makes it very suitable for **mobile websites**).
 This is achieved by grouping together validation functions in "modules", making it possible for the programmer
@@ -332,6 +332,15 @@ $_SESSION['captcha'] = array( mt_rand(0,9), mt_rand(1, 9) );
   <p>Confirm password: <input type="password" name="pass_confirmation" /></p>
 ```
 
+## Changelog
+
+### 2.0
+ * validate_[min|max]_length is removed (now merged with validate_length)
+ * validate_number, validate_int, validate_float is merged together, all three variants is now validated by validate_number
+ * validate_phone moved to "sweden" module and renamed to validate_swephone
+ * The attribute to be used when defining the regular expression for validate_custom is now moved to its own attribute
+ * validate_length now looks at attribute data-validation-length to find out how long or short the value must be
+
 ## Contributors
 [Joel Sutherland](https://github.com/robamaton) (contributor)<br />
 [Steve Wasiura](https://github.com/stevewasiura) (contributor)<br />

js/formvalidator/date.dev.js

@@ -12,7 +12,7 @@
  *
  *
  * @license Dual licensed under the MIT or GPL Version 2 licenses
- * @version 1.9.4
+ * @version 1.9.7
  */
 (function($) {
 

js/formvalidator/date.js

@@ -12,5 +12,5 @@
  *
  *
  * @license Dual licensed under the MIT or GPL Version 2 licenses
- * @version 1.9.4
+ * @version 1.9.7
  */(function(a){a.formUtils.addValidator({name:"validate_time",validate:function(a){if(a.match(/^(\d{2}):(\d{2})$/)===null)return!1;var b=parseInt(a.split(":")[0],10),c=parseInt(a.split(":")[1],10);return b>24||c>59||b===24&&c>0?!1:!0},errorMessage:"",errorMessageKey:"badTime"}),a.formUtils.addValidator({name:"validate_birthdate",validate:function(b,c,d){var e="yyyy-mm-dd";c.attr("data-format")?e=c.attr("data-format"):typeof d.dateFormat!="undefined"&&(e=d.dateFormat);var f=a.formUtils.parseDate(b,e);if(!f)return!1;var g=new Date,h=g.getFullYear(),i=f[0],j=f[1],k=f[2];if(i===h){var l=g.getMonth()+1;if(j===l){var m=g.getDate();return k<=m}return j<l}return i<h&&i>h-124},errorMessage:"",errorMessageKey:"badDate"})})(jQuery);

js/formvalidator/jquery.formvalidator.js

@@ -5,7 +5,7 @@
 * Documentation and issue tracking on Github <https://github.com/victorjonsson/jQuery-Form-Validator/>
 *
 * @license Dual licensed under the MIT or GPL Version 2 licenses
-* @version 1.9.4
+* @version 1.9.7
 */
 (function($) {
 
@@ -413,7 +413,6 @@
             var loadModuleScripts = function(modules, path) {
                 $.each(modules.split(','), function(i, module) {
                     var scriptUrl = path + $.trim(module) + '.js';
-                    var doCache = scriptUrl.substr(-7) != '.dev.js';
                     $.ajax({
                         url : scriptUrl,
                         cache : scriptUrl.substr(-7) != '.dev.js',
@@ -1004,55 +1003,39 @@
         errorMessageKey: 'requiredFields'
     });
 
-    /*
-    * Validate min length
-    */
-    $.formUtils.addValidator({
-        name : 'validate_min_length',
-        validate : function(value, $el, config, language) {
-            var validationRules = $el.attr(config.validationRuleAttribute);
-            var minLength = $.formUtils.getAttributeInteger(validationRules, 'length');
-            if (value.length < minLength) {
-                this.errorMessage = language.toShortStart + minLength + language.toShortEnd;
-                return false;
-            }
-            return true;
-        },
-        errorMessage : '',
-        errorMessageKey: ''
-    });
-
-    /*
-    * Validate max length
-    */
-    $.formUtils.addValidator({
-        name : 'validate_max_length',
-        validate : function(value, $el, config, language) {
-            var validationRules = $el.attr(config.validationRuleAttribute);
-            var maxLength = $.formUtils.getAttributeInteger(validationRules, 'length');
-            if (value.length > maxLength) {
-                this.errorMessage = language.toLongStart + maxLength + language.toLongEnd;
-                return false;
-            }
-            return true;
-        },
-        errorMessage : '',
-        errorMessageKey: ''
-    });
-
     /*
     * Validate length range
     */
     $.formUtils.addValidator({
         name : 'validate_length',
         validate : function(value, $el, config, language) {
-            var validationRules = $el.attr(config.validationRuleAttribute);
-            var lengthRange = $.formUtils.getAttributeInteger(validationRules, 'length');
-            var range = lengthRange.split('-');
-            if (value.length < parseInt(range[0],10) || value.length > parseInt(range[1],10)) {
-                this.errorMessage = language.badLength + lengthRange + language.toLongEnd;
+            var len = $el.attr('data-validation-length');
+            var range = len.split('-');
+
+            // range
+            if(range.length == 2 && (value.length < parseInt(range[0],10) || value.length > parseInt(range[1],10))) {
+                this.errorMessage = language.badLength + len + language.toLongEnd;
                 return false;
             }
+            else if(len.indexOf('min') === 0) {
+                var minLength = parseInt(len.substr(3),10);
+                if(minLength > value.length) {
+                    this.errorMessage = language.toShortStart + minLength + language.toShortEnd;
+                    return false;
+                }
+            }
+            else if(len.indexOf('max') === 0) {
+                var maxLength = parseInt(len.substr(3),10);
+                if(maxLength < value.length) {
+                    this.errorMessage = language.toLongStart + maxLength + language.toLongEnd;
+                    return false;
+                }
+            }
+            else {
+                var elementType = $el.get(0).nodeName;
+                alert('Please add attribute "data-validation-length" to '+elementType+' named '+$el.attr('name'));
+            }
+
             return true;
         },
         errorMessage : '',
@@ -1065,7 +1048,7 @@
     $.formUtils.addValidator({
         name : 'validate_url',
         validate : function(url) {
-            // contributed by Scott Gonzalez: http://projects.scottsplayground.com/iri/ but added support for arrays in the url ?arg[]=sdfsdf
+            // written by Scott Gonzalez: http://projects.scottsplayground.com/iri/ but added support for arrays in the url ?arg[]=sdfsdf
             var urlFilter = /^(https|http|ftp):\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|\[|\]|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(\#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i;
             if(urlFilter.test(url)) {
                 var domain = url.split(/^https|^http|^ftp/i)[1].replace('://', '');
@@ -1086,8 +1069,23 @@
     */
     $.formUtils.addValidator({
         name : 'validate_number',
-        validate : function(val) {
-            return $.formUtils.validators.validate_int.validate(val) || $.formUtils.validators.validate_float.validate(val);
+        validate : function(val, $el) {
+            if(val !== '') {
+                var allowing = $el.attr('data-validation-allowing');
+                if(allowing === undefined)
+                    allowing = 'number';
+
+                if(allowing.indexOf('negative') > -1 && val.indexOf('-') === 0)
+                    val = val.substr(1);
+
+                if(allowing.indexOf('number') > -1 && val.replace(/[0-9]/g, '') === '') {
+                    return true;
+                }
+                if(allowing.indexOf('float') > -1 && val.match(/^([0-9]+)\.([0-9]+)$/) !== null) {
+                    return true;
+                }
+            }
+            return false;
         },
         errorMessage : '',
         errorMessageKey: 'badInt'
@@ -1099,38 +1097,13 @@
     $.formUtils.addValidator({
         name : 'validate_custom',
         validate : function(val, $el, config) {
-            var attr = $el.attr(config.validationRuleAttribute);
-            var regexp = new RegExp(attr.split('regexp/')[1].split('/')[0]);
+            var regexp = new RegExp($el.attr('data-validation-regexp'));
             return regexp.test(val);
         },
         errorMessage : '',
         errorMessageKey: 'badCustomVal'
     });
 
-    /*
-    * Validate integer
-    */
-    $.formUtils.addValidator({
-        name : 'validate_int',
-        validate : function(val) {
-            return val !== '' && val.replace(/[0-9]/g, '') === '';
-        },
-        errorMessage : '',
-        errorMessageKey: 'badInt'
-    });
-
-    /*
-    * Validate floating number
-    */
-    $.formUtils.addValidator({
-        name : 'validate_float',
-        validate : function(val) {
-            return val.match(/^(\-|)([0-9]+)\.([0-9]+)$/) !== null;
-        },
-        errorMessage : '',
-        errorMessageKey: 'badFloat'
-    });
-
     /*
     * Validate date
     */
@@ -1151,27 +1124,4 @@
         errorMessageKey: 'badDate'
     });
 
-    /*
-    * Validate phone number, at least 7 digits only one hyphen and plus allowed
-    */
-    $.formUtils.addValidator({
-        name : 'validate_phone',
-        validate : function(tele) {
-            var numPlus = tele.match(/\+/g);
-            var numHifen = tele.match(/-/g);
-
-            if ((numPlus !== null && numPlus.length > 1) || (numHifen !== null && numHifen.length > 1)) {
-                return false;
-            }
-            if (numPlus !== null && tele.indexOf('+') !== 0) {
-                return false;
-            }
-
-            tele = tele.replace(/([-|\+])/g, '');
-            return tele.length > 8 && tele.match(/[^0-9]/g) === null;
-        },
-        errorMessage : '',
-        errorMessageKey: 'badTelephone'
-    });
-
 })(jQuery);

js/formvalidator/jquery.formvalidator.min.js

@@ -11,7 +11,7 @@
  *
  *
  * @license Dual licensed under the MIT or GPL Version 2 licenses
- * @version 1.9.4
+ * @version 1.9.7
  */
 (function($) {
 

js/formvalidator/location.dev.js

@@ -12,7 +12,7 @@
  *  - validate_backend
  *
  * @license Dual licensed under the MIT or GPL Version 2 licenses
- * @version 1.9.4
+ * @version 1.9.7
  */
 (function($) {