Minor cleanup for PR review

Author: rreusser

src/components/drawing/index.js

@@ -24,6 +24,8 @@ var makeBubbleSizeFn = require('../../traces/scatter/make_bubble_size_func');
 
 var drawing = module.exports = {};
 
+drawing.measureText = require('./measure_text');
+
 // -----------------------------------------------------
 // styling functions for plot elements
 // -----------------------------------------------------

src/traces/carpet/axis_defaults.js

@@ -45,7 +45,6 @@ module.exports = function handleAxisDefaults(containerIn, containerOut, options)
         return Lib.coerce(containerIn, containerOut, attributes, attr, dflt);
     }
 
-    // I don't know what this does:
     function coerce2(attr, dflt) {
         return Lib.coerce2(containerIn, containerOut, attributes, attr, dflt);
     }

src/traces/carpet/measure_text.js

@@ -14,7 +14,6 @@ var Drawing = require('../../components/drawing');
 var map1dArray = require('./map_1d_array');
 var makepath = require('./makepath');
 var orientText = require('./orient_text');
-var measureText = require('./measure_text');
 
 module.exports = function plot(gd, plotinfo, cdcarpet) {
     for(var i = 0; i < cdcarpet.length; i++) {
@@ -153,7 +152,7 @@ function drawAxisLabels(tester, xaxis, yaxis, trace, t, layer, labels, labelClas
             orientation = orientText(trace, xaxis, yaxis, label.xy, [Math.cos(angle), Math.sin(angle)]);
         }
         var direction = (label.endAnchor ? -1 : 1) * orientation.flip;
-        var bbox = measureText(tester, label.text, label.font);
+        var bbox = Drawing.measureText(tester, label.text, label.font);
 
         d3.select(this)
             .attr('text-anchor', direction > 0 ? 'start' : 'end')

src/traces/carpet/plot.js

@@ -40,7 +40,6 @@ module.exports = function style(gd) {
                 .call(Drawing.lineGroupStyle,
                     line.width,
                     line.color,
-                    // contours.coloring === 'lines' ? colorMap(start + i * cs) : line.color,
                     line.dash);
         });