small cleanup

Author: emilykl

src/components/shapes/label_texttemplate.js

@@ -1,26 +1,26 @@
 'use strict';
 
 module.exports = {
-    x0: (function(shape, _xa) { return (_xa.type === 'date') ? shape.x0 : _xa.d2l(shape.x0); }),
-    x1: (function(shape, _xa) { return (_xa.type === 'date') ? shape.x1 : _xa.d2l(shape.x1); }),
-    y0: (function(shape, _xa, _ya) { return (_ya.type === 'date') ? shape.y0 : _ya.d2l(shape.y0); }),
-    y1: (function(shape, _xa, _ya) { return (_ya.type === 'date') ? shape.y1 : _ya.d2l(shape.y1); }),
-    slope: (function(shape, _xa, _ya) {
-        return (_ya.d2l(shape.y1) - _ya.d2l(shape.y0)) / (_xa.d2l(shape.x1) - _xa.d2l(shape.x0));
+    x0: (function(shape, xa) { return (xa.type === 'date') ? shape.x0 : xa.d2l(shape.x0); }),
+    x1: (function(shape, xa) { return (xa.type === 'date') ? shape.x1 : xa.d2l(shape.x1); }),
+    y0: (function(shape, xa, ya) { return (ya.type === 'date') ? shape.y0 : ya.d2l(shape.y0); }),
+    y1: (function(shape, xa, ya) { return (ya.type === 'date') ? shape.y1 : ya.d2l(shape.y1); }),
+    slope: (function(shape, xa, ya) {
+        return (ya.d2l(shape.y1) - ya.d2l(shape.y0)) / (xa.d2l(shape.x1) - xa.d2l(shape.x0));
     }),
-    dx: (function(shape, _xa) { return _xa.d2l(shape.x1) - _xa.d2l(shape.x0); }),
-    dy: (function(shape, _xa, _ya) { return _ya.d2l(shape.y1) - _ya.d2l(shape.y0); }),
-    width: (function(shape, _xa) { return Math.abs(_xa.d2l(shape.x1) - _xa.d2l(shape.x0)); }),
-    height: (function(shape, _xa, _ya) { return Math.abs(_ya.d2l(shape.y1) - _ya.d2l(shape.y0)); }),
-    length: (function(shape, _xa, _ya) {
-        return (shape.type === 'line') ? Math.sqrt(Math.pow((_xa.d2l(shape.x1) - _xa.d2l(shape.x0)), 2) + Math.pow((_ya.d2l(shape.y1) - _ya.d2l(shape.y0)), 2)) : undefined;
+    dx: (function(shape, xa) { return xa.d2l(shape.x1) - xa.d2l(shape.x0); }),
+    dy: (function(shape, xa, ya) { return ya.d2l(shape.y1) - ya.d2l(shape.y0); }),
+    width: (function(shape, xa) { return Math.abs(xa.d2l(shape.x1) - xa.d2l(shape.x0)); }),
+    height: (function(shape, xa, ya) { return Math.abs(ya.d2l(shape.y1) - ya.d2l(shape.y0)); }),
+    length: (function(shape, xa, ya) {
+        return (shape.type === 'line') ? Math.sqrt(Math.pow((xa.d2l(shape.x1) - xa.d2l(shape.x0)), 2) + Math.pow((ya.d2l(shape.y1) - ya.d2l(shape.y0)), 2)) : undefined;
     }),
-    xcenter: (function(shape, _xa) {
-        var val = (_xa.d2l(shape.x1) + _xa.d2l(shape.x0)) / 2;
-        return (_xa.type === 'date') ? _xa.l2d(val) : val;
+    xcenter: (function(shape, xa) {
+        var val = (xa.d2l(shape.x1) + xa.d2l(shape.x0)) / 2;
+        return (xa.type === 'date') ? xa.l2d(val) : val;
     }),
-    ycenter: (function(shape, _xa, _ya) {
-        var val = (_ya.d2l(shape.y1) + _ya.d2l(shape.y0)) / 2;
-        return (_ya.type === 'date') ? _ya.l2d(val) : val;
+    ycenter: (function(shape, xa, ya) {
+        var val = (ya.d2l(shape.y1) + ya.d2l(shape.y0)) / 2;
+        return (ya.type === 'date') ? ya.l2d(val) : val;
     })
 };

src/lib/index.js

@@ -1082,7 +1082,7 @@ var MULT_DIV_REGEX = /^(\S+)([\*\/])(-?\d+(\.\d+)?)$/;
 function multDivParser(inputStr) {
     var match = inputStr.match(MULT_DIV_REGEX);
     if(match) return { key: match[1], op: match[2], number: Number(match[3]) };
-    else return { key: inputStr, op: null, number: null };
+    return { key: inputStr, op: null, number: null };
 }
 var texttemplateWarningsForShapes = {
     max: 10,
@@ -1177,8 +1177,8 @@ function templateFormatString(string, labels, d3locale) {
         }
 
         // Apply mult/div operation (if applicable)
-        if(parsedOp) {
-            value = (value === undefined) ? undefined : {
+        if((parsedOp === '*' || parsedOp === '/') && value !== undefined) {
+            value = {
                 '*': (function(v) { return v * parsedNumber; }),
                 '/': (function(v) { return v / parsedNumber; }),
             }[parsedOp](value);