From 9d566a0cd0225685efb192c195280b6857628d32 Mon Sep 17 00:00:00 2001 From: Misko Hevery Date: Fri, 5 Feb 2010 14:41:45 -0800 Subject: better integer farmater --- src/Validators.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/Validators.js b/src/Validators.js index 5549ee39..84681f15 100644 --- a/src/Validators.js +++ b/src/Validators.js @@ -24,11 +24,12 @@ foreach({ }, 'integer': function(value, min, max) { - var number = angularValidator['number'](value, min, max); - if (number === null && value != Math.round(value)) { + var numberError = angularValidator['number'](value, min, max); + if (numberError) return numberError; + if (!("" + value).match(/^\s*[\d+]*\s*$/) || value != Math.round(value)) { return "Value is not a whole number."; } - return number; + return null; }, 'date': function(value, min, max) { -- cgit v1.2.3