catch and handle bad d3 number format instead of throwing error

Author: archmoj

src/lib/index.js

@@ -12,25 +12,33 @@ var BADNUM = numConstants.BADNUM;
 
 var lib = module.exports = {};
 
-lib.adjustFormat = function adjustFormat(a) {
+lib.adjustFormat = function adjustFormat(formatStr) {
     if(
-        !a ||
-        /^[0123456789].[0123456789]f/.test(a) ||
-        /.[0123456789]%/.test(a)
-    ) return a;
+        !formatStr ||
+        /^[0123456789].[0123456789]f/.test(formatStr) ||
+        /.[0123456789]%/.test(formatStr)
+    ) return formatStr;
 
-    if(a === '0.f') return '~f';
-    if(/^[0123456789]%/.test(a)) return '~%';
-    if(/^[0123456789]s/.test(a)) return '~s';
+    if(formatStr === '0.f') return '~f';
+    if(/^[0123456789]%/.test(formatStr)) return '~%';
+    if(/^[0123456789]s/.test(formatStr)) return '~s';
 
     // try adding tilde to the start of format in order to trim
-    if(!(/^[~,.0$]/.test(a)) && /[&fps]/.test(a)) return '~' + a;
+    if(!(/^[~,.0$]/.test(formatStr)) && /[&fps]/.test(formatStr)) return '~' + formatStr;
 
-    return a;
+    return formatStr;
 };
 
-lib.numberFormat = function(a) {
-    return d3Format(lib.adjustFormat(a));
+lib.noFormat = function(value) { return value; };
+
+lib.numberFormat = function(formatStr) {
+    try {
+        formatStr = d3Format(lib.adjustFormat(formatStr));
+    } catch(e) {
+        return lib.noFormat;
+    }
+
+    return formatStr;
 };
 
 lib.nestedProperty = require('./nested_property');

src/plots/plots.js

@@ -703,10 +703,16 @@ function getFormatter(formatObj, separators) {
     formatObj.thousands = separators.charAt(1);
 
     return {
-        numberFormat: function(a) {
-            return formatLocale(formatObj).format(
-                Lib.adjustFormat(a)
-            );
+        numberFormat: function(formatStr) {
+            try {
+                formatStr = formatLocale(formatObj).format(
+                    Lib.adjustFormat(formatStr)
+                );
+            } catch(e) {
+                return Lib.noFormat;
+            }
+
+            return formatStr;
         },
         timeFormat: timeFormatLocale(formatObj).utcFormat
     };