Implemented number range validation, issue victorjonsson#60

victorjonsson · victorjonsson · commit 50936531e2ef · 2013-11-17T10:58:38.000+01:00
diff --git a/README.md b/README.md
@@ -295,10 +295,11 @@ it calls jQ func **$.formUtils.validateInput** to validate the single input when
 ## Changelog
 
 
-### 2.1.x
+### 2.1.27
  * E-mail validation support .eu top domain
  * Improvements in server validation
  * Now possible to re-initiate the validation. This makes it possible to dynamically change the form and then call $.validate() again to refresh the validation (issue #59)
+ * Number validation now supports range
 
 ### 2.1.15
  * E-mail addresses can now contain + symbol
@@ -361,6 +362,7 @@ calling $.validate()
 <a href="https://github.com/aL3xa" target="_blank">Alexandar Blagotic</a><br />
 <a href="http://thekindof.me/" target="_blank">Yasith Fernando</a><br />
 <a href="https://github.com/S0L4R1S" target="_blank">@S0L4R1S</a><br />
+<a href="http://lisangan.com/">Erick Lisangan</a>
 
 #### Additional credits
 
diff --git a/form-validator/date.dev.js b/form-validator/date.dev.js
@@ -10,7 +10,7 @@
  *
  * @website http://formvalidator.net/#location-validators
  * @license Dual licensed under the MIT or GPL Version 2 licenses
- * @version 2.1.26
+ * @version 2.1.27
  */
 (function($) {
 
diff --git a/form-validator/file.dev.js b/form-validator/file.dev.js
@@ -10,7 +10,7 @@
  *
  * @website http://formvalidator.net/
  * @license Dual licensed under the MIT or GPL Version 2 licenses
- * @version 2.1.26
+ * @version 2.1.27
  */
 (function($, window) {
 
diff --git a/form-validator/jquery.form-validator.js b/form-validator/jquery.form-validator.js
@@ -5,7 +5,7 @@
 *
 * @website http://formvalidator.net/
 * @license Dual licensed under the MIT or GPL Version 2 licenses
-* @version 2.1.26
+* @version 2.1.27
 */
 (function($) {
 
@@ -1384,7 +1384,9 @@
         validatorFunction : function(val, $el, config) {
             if(val !== '') {
                 var allowing = $el.valAttr('allowing') || '',
-                    decimalSeparator = $el.valAttr('decimal-separator') || config.decimalSeparator;
+                    decimalSeparator = $el.valAttr('decimal-separator') || config.decimalSeparator,
+                    allowsRange = false,
+                    begin, end;
 
                 if(allowing.indexOf('number') == -1)
                     allowing += ',number';
@@ -1393,10 +1395,17 @@
                     val = val.substr(1);
                 }
 
-                if(allowing.indexOf('number') > -1 && val.replace(/[0-9]/g, '') === '') {
+                if (allowing.indexOf('range') > -1)
+                {
+                    begin = parseFloat(allowing.substring(allowing.indexOf("[")+1, allowing.indexOf(";")));
+                    end = parseFloat(allowing.substring(allowing.indexOf(";")+1,allowing.indexOf("]")));
+                    allowsRange = true;
+                }
+
+                if(allowing.indexOf('number') > -1 && val.replace(/[0-9]/g, '') === '' && (!allowsRange || (val >= begin && val <= end)) ) {
                     return true;
                 }
-                if(allowing.indexOf('float') > -1 && val.match(new RegExp('^([0-9]+)\\'+decimalSeparator+'([0-9]+)$')) !== null) {
+                if(allowing.indexOf('float') > -1 && val.match(new RegExp('^([0-9]+)\\'+decimalSeparator+'([0-9]+)$')) !== null && (!allowsRange || (val >= begin && val <= end)) ) {
                     return true;
                 }
             }
diff --git a/form-validator/jquery.form-validator.min.js b/form-validator/jquery.form-validator.min.js
diff --git a/form-validator/location.dev.js b/form-validator/location.dev.js
@@ -10,7 +10,7 @@
  *
  * @website http://formvalidator.net/#location-validators
  * @license Dual licensed under the MIT or GPL Version 2 licenses
- * @version 2.1.26
+ * @version 2.1.27
  */
 (function($) {
 
diff --git a/form-validator/qunit.html b/form-validator/qunit.html
@@ -212,7 +212,15 @@
                 {val:input('1.0235', {'allowing':'float,negative,number', '':'number'}), isValid:true},
                 {val:input('1.0236', {'allowing':'float,negative,number', 'decimal-separator':',', '':'number'}), isValid:false},
                 //{val:input('1,023', {'allowing':'float,negative,number', 'decimal-separator':',', '':'number'}), isValid:true},
-                {val:'123', isValid:true}
+                {val:'123', isValid:true},
+                {val:input('12', {'allowing':'range[1;10]', '':'number'}), isValid:false},
+                {val:input('-1', {'allowing':'range[1;10]', '':'number'}), isValid:false},
+                {val:input('1', {'allowing':'range[1;10]', '':'number'}), isValid:true},
+                {val:input('10', {'allowing':'range[1;10]', '':'number'}), isValid:true},
+                {val:input('5', {'allowing':'range[1;10]', '':'number'}), isValid:true},
+                {val:input('-1', {'allowing':'range[-10;10],negative', '':'number'}), isValid:true},
+                {val:input('0.0001', {'allowing':'range[0.05;0.9]', '':'number'}), isValid:false},
+                {val:input('0.06', {'allowing':'range[0.05;0.9],float', '':'number'}), isValid:true}
             ];
 
             $.each(links, function(i, obj) {
diff --git a/form-validator/security.dev.js b/form-validator/security.dev.js
@@ -12,7 +12,7 @@
  *
  * @website http://formvalidator.net/#security-validators
  * @license Dual licensed under the MIT or GPL Version 2 licenses
- * @version 2.1.26
+ * @version 2.1.27
  */
 (function($) {
 
diff --git a/form-validator/sweden.dev.js b/form-validator/sweden.dev.js
@@ -13,7 +13,7 @@
  *
  * @website http://formvalidator.net/#swedish-validators
  * @license Dual licensed under the MIT or GPL Version 2 licenses
- * @version 2.1.26
+ * @version 2.1.27
  */
 (function($, window) {
 
diff --git a/form-validator/uk.dev.js b/form-validator/uk.dev.js
@@ -9,7 +9,7 @@
  *
  * @website http://formvalidator.net/#uk-validators
  * @license Dual licensed under the MIT or GPL Version 2 licenses
- * @version 2.1.26
+ * @version 2.1.27
  */
 $.formUtils.addValidator({
     name : 'ukvatnumber',
diff --git a/formvalidator.jquery.json b/formvalidator.jquery.json
@@ -7,7 +7,7 @@
         "validation",
         "validator"
     ],
-    "version" : "2.1.15",
+    "version" : "2.1.27",
     "author" : {
         "name": "Victor Jonsson",
         "url": "http://victorjonsson.se",

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`*`
`11`	`11`	`* @website http://formvalidator.net/#location-validators`
`12`	`12`	`* @license Dual licensed under the MIT or GPL Version 2 licenses`
`13`		`- * @version 2.1.26`
	`13`	`+ * @version 2.1.27`
`14`	`14`	`*/`
`15`	`15`	`(function($) {`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`*`
`13`	`13`	`* @website http://formvalidator.net/#security-validators`
`14`	`14`	`* @license Dual licensed under the MIT or GPL Version 2 licenses`
`15`		`- * @version 2.1.26`
	`15`	`+ * @version 2.1.27`
`16`	`16`	`*/`
`17`	`17`	`(function($) {`
`18`	`18`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`*`
`14`	`14`	`* @website http://formvalidator.net/#swedish-validators`
`15`	`15`	`* @license Dual licensed under the MIT or GPL Version 2 licenses`
`16`		`- * @version 2.1.26`
	`16`	`+ * @version 2.1.27`
`17`	`17`	`*/`
`18`	`18`	`(function($, window) {`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`*`
`10`	`10`	`* @website http://formvalidator.net/#uk-validators`
`11`	`11`	`* @license Dual licensed under the MIT or GPL Version 2 licenses`
`12`		`- * @version 2.1.26`
	`12`	`+ * @version 2.1.27`
`13`	`13`	`*/`
`14`	`14`	`$.formUtils.addValidator({`
`15`	`15`	`name : 'ukvatnumber',`