added better handling of ng:format=number

1 files changed, 7 insertions, 4 deletions

diff --git a/src/formatters.js b/src/formatters.js
index 9122489f..5c8764ac 100644
--- a/src/formatters.js
+++ b/src/formatters.js
@@ -1,5 +1,7 @@
 function formatter(format, parse) {return {'format':format, 'parse':parse || format};}
-function toString(obj) {return (isDefined(obj) && obj !== null) ? "" + obj : obj;}
+function toString(obj) {
+  return (isDefined(obj) && obj !== null) ? "" + obj : obj;
+}
 
 var NUMBER = /^\s*[-+]?\d*(\.\d*)?\s*$/;
 
@@ -7,10 +9,11 @@ angularFormatter.noop = formatter(identity, identity);
 angularFormatter.json = formatter(toJson, fromJson);
 angularFormatter['boolean'] = formatter(toString, toBoolean);
 angularFormatter.number = formatter(toString, function(obj){
-  if (isString(obj) && NUMBER.exec(obj)) {
-    return obj ? 1*obj : null;
+  if (obj == null || NUMBER.exec(obj)) {
+    return obj===null || obj === '' ? null : 1*obj;
+  } else {
+    throw "Not a number";
   }
-  throw "Not a number";
 });
 
 angularFormatter.list = formatter(