more d3-esque pattern in Axes.drawLabels

Author: etpinard

src/components/colorbar/draw.js

@@ -452,7 +452,6 @@ module.exports = function draw(gd, id) {
                     return Axes.drawLabels(gd, cbAxisOut, {
                         vals: vals,
                         layer: axisLayer,
-                        shift: shift,
                         transFn: transFn,
                         labelXFn: labelFns.labelXFn,
                         labelYFn: labelFns.labelYFn,

src/plots/cartesian/axes.js

@@ -1688,18 +1688,18 @@ axes.drawOne = function(gd, ax, opts) {
 
     // tick labels - for now just the main labels.
     // TODO: mirror labels, esp for subplots
-    seq.push(function() {
-        return axes.drawLabels(gd, ax, {
-            vals: vals,
-            layer: mainPlotinfo[axLetter + 'axislayer'],
-            // TODO shouldn't need this
-            shift: ax._mainLinePosition,
-            transFn: transFn,
-            labelXFn: labelFns.labelXFn,
-            labelYFn: labelFns.labelYFn,
-            labelAnchorFn: labelFns.labelAnchorFn,
+    if(ax._mainLinePosition) {
+        seq.push(function() {
+            return axes.drawLabels(gd, ax, {
+                vals: vals,
+                layer: mainPlotinfo[axLetter + 'axislayer'],
+                transFn: transFn,
+                labelXFn: labelFns.labelXFn,
+                labelYFn: labelFns.labelYFn,
+                labelAnchorFn: labelFns.labelAnchorFn,
+            });
         });
-    });
+    }
 
     if(!opts.skipTitle &&
         !((ax.rangeslider || {}).visible && ax._boundingBox && ax.side === 'bottom')
@@ -2031,12 +2031,7 @@ axes.drawLabels = function(gd, ax, opts) {
     var labelAnchorFn = opts.labelAnchorFn;
 
     var tickLabels = opts.layer.selectAll('g.' + cls)
-        .data(vals, makeDataFn(ax));
-
-    if(!isNumeric(opts.shift) || !ax.showticklabels) {
-        tickLabels.remove();
-        return;
-    }
+        .data(ax.showticklabels ? vals : [], makeDataFn(ax));
 
     var maxFontSize = 0;
     var autoangle = 0;

src/plots/polar/polar.js

@@ -426,7 +426,6 @@ proto.updateRadialAxis = function(fullLayout, polarLayout) {
         Axes.drawLabels(gd, ax, {
             vals: vals,
             layer: layers['radial-axis'],
-            shift: 0,
             transFn: transFn,
             labelXFn: labelFns.labelXFn,
             labelYFn: labelFns.labelYFn,
@@ -640,7 +639,6 @@ proto.updateAngularAxis = function(fullLayout, polarLayout) {
         Axes.drawLabels(gd, ax, {
             vals: vals,
             layer: layers['angular-axis'],
-            shift: 0,
             transFn: transFn,
             labelXFn: labelXFn,
             labelYFn: labelYFn,

src/plots/ternary/ternary.js

@@ -462,7 +462,6 @@ proto.drawAx = function(ax) {
     Axes.drawLabels(gd, ax, {
         vals: vals,
         layer: axLayer,
-        shift: 0,
         transFn: transFn,
         labelXFn: labelFns.labelXFn,
         labelYFn: labelFns.labelYFn,