aboutsummaryrefslogtreecommitdiffstats
path: root/src/validators.js
diff options
context:
space:
mode:
authorMisko Hevery2010-08-18 16:23:12 -0700
committerMisko Hevery2010-08-18 17:26:33 -0700
commit5ddd8d958686c5075b6c58b700f19b4bdea90e1d (patch)
treef43da0153fb41244425c00fc728a17028671ce03 /src/validators.js
parent1087270c95f6bbafd3715c9a5eecdafac79c9daa (diff)
downloadangular.js-5ddd8d958686c5075b6c58b700f19b4bdea90e1d.tar.bz2
stringify names for better compression, remove dead functions, removed underscore.js compatibility
Diffstat (limited to 'src/validators.js')
-rw-r--r--src/validators.js26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/validators.js b/src/validators.js
index 5c7fc952..b99c8aa9 100644
--- a/src/validators.js
+++ b/src/validators.js
@@ -1,25 +1,25 @@
foreach({
- 'noop': function() { return null; },
+ 'noop': function() { return _null; },
'regexp': function(value, regexp, msg) {
if (!value.match(regexp)) {
return msg ||
"Value does not match expected format " + regexp + ".";
} else {
- return null;
+ return _null;
}
},
'number': function(value, min, max) {
var num = 1 * value;
if (num == value) {
- if (typeof min != 'undefined' && num < min) {
+ if (typeof min != $undefined && num < min) {
return "Value can not be less than " + min + ".";
}
- if (typeof min != 'undefined' && num > max) {
+ if (typeof min != $undefined && num > max) {
return "Value can not be greater than " + max + ".";
}
- return null;
+ return _null;
} else {
return "Not a number";
}
@@ -31,43 +31,43 @@ foreach({
if (!("" + value).match(/^\s*[\d+]*\s*$/) || value != Math.round(value)) {
return "Not a whole number";
}
- return null;
+ return _null;
},
'date': function(value, min, max) {
if (value.match(/^\d\d?\/\d\d?\/\d\d\d\d$/)) {
- return null;
+ return _null;
}
return "Value is not a date. (Expecting format: 12/31/2009).";
},
'ssn': function(value) {
if (value.match(/^\d\d\d-\d\d-\d\d\d\d$/)) {
- return null;
+ return _null;
}
return "SSN needs to be in 999-99-9999 format.";
},
'email': function(value) {
if (value.match(/^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,4}$/)) {
- return null;
+ return _null;
}
return "Email needs to be in username@host.com format.";
},
'phone': function(value) {
if (value.match(/^1\(\d\d\d\)\d\d\d-\d\d\d\d$/)) {
- return null;
+ return _null;
}
if (value.match(/^\+\d{2,3} (\(\d{1,5}\))?[\d ]+\d$/)) {
- return null;
+ return _null;
}
return "Phone number needs to be in 1(987)654-3210 format in North America or +999 (123) 45678 906 internationaly.";
},
'url': function(value) {
if (value.match(/^(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?$/)) {
- return null;
+ return _null;
}
return "URL needs to be in http://server[:port]/path format.";
},
@@ -75,7 +75,7 @@ foreach({
'json': function(value) {
try {
fromJson(value);
- return null;
+ return _null;
} catch (e) {
return e.toString();
}