improve re use (/g instead of loop)

stuarthalloway · May 22, 2009 · a3cb095 · a3cb095
1 parent 2d915cb
commit a3cb095
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/public/javascripts/jquery.numberformatter-1.1.2.js b/public/javascripts/jquery.numberformatter-1.1.2.js
@@ -226,9 +226,10 @@
        var text = new String(jQuery(this).valOrText());
 
         // now we need to convert it into a number
-        while (text.indexOf(group)>-1)
-               text = text.replace(group,'');
-        var number = new Number(text.replace(dec,".").replace(neg,"-"));
+        // technical debt: what happens to numbers with more than one decimal or negative sign?
+        var number = new Number(text.replace(new RegExp(group, "g"), "")
+                                    .replace(dec,".")
+                                    .replace(neg,"-"));
 
         // special case for percentages
         if (options.suffix == "%")

diff --git a/test/javascript/numberformatter_spec.js b/test/javascript/numberformatter_spec.js
@@ -69,5 +69,17 @@ Screw.Unit(function(){
       expect($("#value").text()).to(equal, "-11.13");
     });
 
+    it("handles numbers that already contain formatting", function(){
+      $("#value").text("123,456,789");
+      $("#value").format({format: "#"});
+      expect($("#value").text()).to(equal, "123456789");
+    });
+
+    it("handles numbers that already contain *bad* formatting", function(){
+      $("#value").text("1,2,3,4,5");
+      $("#value").format({format: "#"});
+      expect($("#value").text()).to(equal, "12345");
+    });
+
   });
 });