Skip to content

Commit 5093653

Browse files
committed
Implemented number range validation, issue victorjonsson#60
1 parent 8e37bb4 commit 5093653

11 files changed

+34
-14
lines changed

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,10 +295,11 @@ it calls jQ func **$.formUtils.validateInput** to validate the single input when
295295
## Changelog
296296

297297

298-
### 2.1.x
298+
### 2.1.27
299299
* E-mail validation support .eu top domain
300300
* Improvements in server validation
301301
* 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)
302+
* Number validation now supports range
302303

303304
### 2.1.15
304305
* E-mail addresses can now contain + symbol
@@ -361,6 +362,7 @@ calling $.validate()
361362
<a href="https://github.com/aL3xa" target="_blank">Alexandar Blagotic</a><br />
362363
<a href="http://thekindof.me/" target="_blank">Yasith Fernando</a><br />
363364
<a href="https://github.com/S0L4R1S" target="_blank">@S0L4R1S</a><br />
365+
<a href="http://lisangan.com/">Erick Lisangan</a>
364366

365367
#### Additional credits
366368

form-validator/date.dev.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
* @website http://formvalidator.net/#location-validators
1212
* @license Dual licensed under the MIT or GPL Version 2 licenses
13-
* @version 2.1.26
13+
* @version 2.1.27
1414
*/
1515
(function($) {
1616

form-validator/file.dev.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
* @website http://formvalidator.net/
1212
* @license Dual licensed under the MIT or GPL Version 2 licenses
13-
* @version 2.1.26
13+
* @version 2.1.27
1414
*/
1515
(function($, window) {
1616

form-validator/jquery.form-validator.js

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*
66
* @website http://formvalidator.net/
77
* @license Dual licensed under the MIT or GPL Version 2 licenses
8-
* @version 2.1.26
8+
* @version 2.1.27
99
*/
1010
(function($) {
1111

@@ -1384,7 +1384,9 @@
13841384
validatorFunction : function(val, $el, config) {
13851385
if(val !== '') {
13861386
var allowing = $el.valAttr('allowing') || '',
1387-
decimalSeparator = $el.valAttr('decimal-separator') || config.decimalSeparator;
1387+
decimalSeparator = $el.valAttr('decimal-separator') || config.decimalSeparator,
1388+
allowsRange = false,
1389+
begin, end;
13881390

13891391
if(allowing.indexOf('number') == -1)
13901392
allowing += ',number';
@@ -1393,10 +1395,17 @@
13931395
val = val.substr(1);
13941396
}
13951397

1396-
if(allowing.indexOf('number') > -1 && val.replace(/[0-9]/g, '') === '') {
1398+
if (allowing.indexOf('range') > -1)
1399+
{
1400+
begin = parseFloat(allowing.substring(allowing.indexOf("[")+1, allowing.indexOf(";")));
1401+
end = parseFloat(allowing.substring(allowing.indexOf(";")+1,allowing.indexOf("]")));
1402+
allowsRange = true;
1403+
}
1404+
1405+
if(allowing.indexOf('number') > -1 && val.replace(/[0-9]/g, '') === '' && (!allowsRange || (val >= begin && val <= end)) ) {
13971406
return true;
13981407
}
1399-
if(allowing.indexOf('float') > -1 && val.match(new RegExp('^([0-9]+)\\'+decimalSeparator+'([0-9]+)$')) !== null) {
1408+
if(allowing.indexOf('float') > -1 && val.match(new RegExp('^([0-9]+)\\'+decimalSeparator+'([0-9]+)$')) !== null && (!allowsRange || (val >= begin && val <= end)) ) {
14001409
return true;
14011410
}
14021411
}

form-validator/jquery.form-validator.min.js

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

form-validator/location.dev.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
* @website http://formvalidator.net/#location-validators
1212
* @license Dual licensed under the MIT or GPL Version 2 licenses
13-
* @version 2.1.26
13+
* @version 2.1.27
1414
*/
1515
(function($) {
1616

form-validator/qunit.html

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,15 @@
212212
{val:input('1.0235', {'allowing':'float,negative,number', '':'number'}), isValid:true},
213213
{val:input('1.0236', {'allowing':'float,negative,number', 'decimal-separator':',', '':'number'}), isValid:false},
214214
//{val:input('1,023', {'allowing':'float,negative,number', 'decimal-separator':',', '':'number'}), isValid:true},
215-
{val:'123', isValid:true}
215+
{val:'123', isValid:true},
216+
{val:input('12', {'allowing':'range[1;10]', '':'number'}), isValid:false},
217+
{val:input('-1', {'allowing':'range[1;10]', '':'number'}), isValid:false},
218+
{val:input('1', {'allowing':'range[1;10]', '':'number'}), isValid:true},
219+
{val:input('10', {'allowing':'range[1;10]', '':'number'}), isValid:true},
220+
{val:input('5', {'allowing':'range[1;10]', '':'number'}), isValid:true},
221+
{val:input('-1', {'allowing':'range[-10;10],negative', '':'number'}), isValid:true},
222+
{val:input('0.0001', {'allowing':'range[0.05;0.9]', '':'number'}), isValid:false},
223+
{val:input('0.06', {'allowing':'range[0.05;0.9],float', '':'number'}), isValid:true}
216224
];
217225

218226
$.each(links, function(i, obj) {

form-validator/security.dev.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*
1313
* @website http://formvalidator.net/#security-validators
1414
* @license Dual licensed under the MIT or GPL Version 2 licenses
15-
* @version 2.1.26
15+
* @version 2.1.27
1616
*/
1717
(function($) {
1818

form-validator/sweden.dev.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
*
1414
* @website http://formvalidator.net/#swedish-validators
1515
* @license Dual licensed under the MIT or GPL Version 2 licenses
16-
* @version 2.1.26
16+
* @version 2.1.27
1717
*/
1818
(function($, window) {
1919

form-validator/uk.dev.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
* @website http://formvalidator.net/#uk-validators
1111
* @license Dual licensed under the MIT or GPL Version 2 licenses
12-
* @version 2.1.26
12+
* @version 2.1.27
1313
*/
1414
$.formUtils.addValidator({
1515
name : 'ukvatnumber',

formvalidator.jquery.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"validation",
88
"validator"
99
],
10-
"version" : "2.1.15",
10+
"version" : "2.1.27",
1111
"author" : {
1212
"name": "Victor Jonsson",
1313
"url": "http://victorjonsson.se",

0 commit comments

Comments
 (0)