simplify parsing logic

emilykl · emilykl · commit 01632814ed75 · 2023-04-16T13:25:26.000-04:00
diff --git a/src/lib/index.js b/src/lib/index.js
@@ -1177,11 +1177,9 @@ function templateFormatString(string, labels, d3locale) {
         }
 
         // Apply mult/div operation (if applicable)
-        if((parsedOp === '*' || parsedOp === '/') && value !== undefined) {
-            value = {
-                '*': (function(v) { return v * parsedNumber; }),
-                '/': (function(v) { return v / parsedNumber; }),
-            }[parsedOp](value);
+        if(value !== undefined) {
+            if(parsedOp === '*') value *= parsedNumber;
+            if(parsedOp === '/') value /= parsedNumber;
         }
 
         if(value === undefined && opts) {

Original file line number	Diff line number	Diff line change
`@@ -1177,11 +1177,9 @@ function templateFormatString(string, labels, d3locale) {`
`1177`	`1177`	`}`
`1178`	`1178`
`1179`	`1179`	`// Apply mult/div operation (if applicable)`
`1180`		`- if((parsedOp === '*' \|\| parsedOp === '/') && value !== undefined) {`
`1181`		`- value = {`
`1182`		`- '': (function(v) { return v parsedNumber; }),`
`1183`		`- '/': (function(v) { return v / parsedNumber; }),`
`1184`		`- }[parsedOp](value);`
	`1180`	`+ if(value !== undefined) {`
	`1181`	`+ if(parsedOp === '') value = parsedNumber;`
	`1182`	`+ if(parsedOp === '/') value /= parsedNumber;`
`1185`	`1183`	`}`
`1186`	`1184`
`1187`	`1185`	`if(value === undefined && opts) {`