simplify exports/imports for shapeLabelTexttemplateVars

Author: emilykl

src/components/shapes/attributes.js

@@ -8,7 +8,7 @@ var extendFlat = require('../../lib/extend').extendFlat;
 var templatedArray = require('../../plot_api/plot_template').templatedArray;
 var axisPlaceableObjs = require('../../constants/axis_placeable_objects');
 var shapeTexttemplateAttrs = require('../../plots/template_attributes').shapeTexttemplateAttrs;
-var shapeLabelTexttemplateVars = require('./label_texttemplate').shapeLabelTexttemplateVars;
+var shapeLabelTexttemplateVars = require('./label_texttemplate');
 
 module.exports = templatedArray('shape', {
     visible: {

src/components/shapes/draw.js

@@ -23,7 +23,7 @@ var svgTextUtils = require('../../lib/svg_text_utils');
 var constants = require('./constants');
 var helpers = require('./helpers');
 var getPathString = helpers.getPathString;
-var shapeLabelTexttemplateVars = require('./label_texttemplate').shapeLabelTexttemplateVars;
+var shapeLabelTexttemplateVars = require('./label_texttemplate');
 var FROM_TL = require('../../constants/alignment').FROM_TL;
 
 

src/components/shapes/draw_newshape/attributes.js

@@ -4,7 +4,7 @@ var fontAttrs = require('../../../plots/font_attributes');
 var dash = require('../../drawing/attributes').dash;
 var extendFlat = require('../../../lib/extend').extendFlat;
 var shapeTexttemplateAttrs = require('../../../plots/template_attributes').shapeTexttemplateAttrs;
-var shapeLabelTexttemplateVars = require('../label_texttemplate').shapeLabelTexttemplateVars;
+var shapeLabelTexttemplateVars = require('../label_texttemplate');
 
 
 module.exports = {

src/components/shapes/label_texttemplate.js

@@ -1,28 +1,26 @@
 'use strict';
 
 module.exports = {
-    shapeLabelTexttemplateVars: {
-        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;
-        }),
-        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;
-        }),
-    }
+    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;
+    }),
+    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;
+    })
 };