Merge pull request #1185 from plotly/clean-datum-regression-alt

fix regression in lib/clean_number (alternate)

Author: etpinard

src/lib/clean_number.js

@@ -13,17 +13,16 @@ var isNumeric = require('fast-isnumeric');
 
 var BADNUM = require('../constants/numerical').BADNUM;
 
-// precompile these regex's for speed
-var FRONTJUNK = /^['"%,$#\s']+/;
-var ENDJUNK = /['"%,$#\s']+$/;
+// precompile for speed
+var JUNK = /^['"%,$#\s']+|[, ]|['"%,$#\s']+$/g;
 
 /**
  * cleanNumber: remove common leading and trailing cruft
  * Always returns either a number or BADNUM.
  */
 module.exports = function cleanNumber(v) {
     if(typeof v === 'string') {
-        v = v.replace(FRONTJUNK, '').replace(ENDJUNK, '');
+        v = v.replace(JUNK, '');
     }
 
     if(isNumeric(v)) return Number(v);

test/jasmine/tests/lib_test.js

@@ -1522,7 +1522,12 @@ describe('Test lib.js:', function() {
                 ['-100.001', -100.001],
                 ['  $4.325  #%\t', 4.325],
                 [' " #1" ', 1],
-                [' \'\n \r -9.2e7   \t\' ', -9.2e7]
+                [' \'\n \r -9.2e7   \t\' ', -9.2e7],
+                ['1,690,000', 1690000],
+                ['1 690 000', 1690000],
+                ['2 2', 22],
+                ['$5,162,000.00', 5162000],
+                [' $1,410,000.00 ', 1410000],
             ].forEach(function(v) {
                 expect(Lib.cleanNumber(v[0])).toBe(v[1], v[0]);
             });
@@ -1531,7 +1536,7 @@ describe('Test lib.js:', function() {
         it('should not accept other objects or cruft in the middle', function() {
             [
                 NaN, Infinity, -Infinity, null, undefined, new Date(), '',
-                ' ', '\t', '2 2', '2%2', '2$2', {1: 2}, [1], ['1'], {}, []
+                ' ', '\t', '2\t2', '2%2', '2$2', {1: 2}, [1], ['1'], {}, []
             ].forEach(function(v) {
                 expect(Lib.cleanNumber(v)).toBeUndefined(v);
             });