Merge branch 'pr/99' into develop

Conflicts: min/numeral.min.js
gscottolson · Oct 30, 2013 · fd2ea10 · fd2ea10
2 parents cb80270 + 5831367
commit fd2ea10
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/numeral.js b/numeral.js
@@ -488,6 +488,9 @@
         },
 
         unformat : function (inputString) {
+            if (Object.prototype.toString.call(inputString) === '[object Number]') { 
+                return inputString; 
+            }
             return unformatNumeral(this, inputString ? inputString : defaultFormat);
         },
 

diff --git a/tests/numeral/unformat.js b/tests/numeral/unformat.js
@@ -7,7 +7,7 @@ exports.unformat = {
     },
 
     numbers: function (test) {
-        test.expect(9);
+        test.expect(15);
 
         var tests = [
                 ['10,000.123', 10000.123],
@@ -18,7 +18,15 @@ exports.unformat = {
                 ['1.23t', 1230000000000],
                 ['N/A', 0],
                 [, 0],
-                ['', 0]
+                ['', 0],
+
+                // Pass Through for Numbers
+                [0, 0],
+                [1, 1],
+                [1.1, 1.1],
+                [-0, 0],
+                [-1, -1],
+                [-1.1, -1.1]
             ];
 
         for (var i = 0; i < tests.length; i++) {