simplify process of skipping labels

Author: archmoj

src/plots/cartesian/axes.js

@@ -887,7 +887,7 @@ axes.calcTicks = function calcTicks(ax, opts) {
             value: x
         };
 
-        if(ticklabelstep > 1 && (id % ticklabelstep)) {
+        if(ticklabelstep > 1 && id % ticklabelstep) {
             obj.skipLabel = true;
         }
 
@@ -944,13 +944,11 @@ axes.calcTicks = function calcTicks(ax, opts) {
     ax._prevDateHead = '';
     ax._inCalcTicks = true;
 
-    var firstLabelCreated = false;
     var ticksOut = [];
     var t, p;
     for(i = 0; i < tickVals.length; i++) {
         var _minor = tickVals[i].minor;
         var _value = tickVals[i].value;
-        var _skipLabel = tickVals[i].skipLabel;
 
         t = axes.tickText(
             ax,
@@ -959,14 +957,6 @@ axes.calcTicks = function calcTicks(ax, opts) {
             _minor // noSuffixPrefix
         );
 
-        if(tickVals[i].skipLabel) {
-            t.skipLabel = _skipLabel;
-
-            if(!firstLabelCreated) ax._prevDateHead = '';
-        } else {
-            firstLabelCreated = true;
-        }
-
         p = tickVals[i].periodX;
         if(p !== undefined) {
             t.periodX = p;
@@ -979,6 +969,10 @@ axes.calcTicks = function calcTicks(ax, opts) {
             }
         }
 
+        if(tickVals[i].skipLabel) {
+            t.text = ' ';
+        }
+
         ticksOut.push(t);
     }
 
@@ -3007,9 +3001,7 @@ axes.drawLabels = function(gd, ax, opts) {
     var axLetter = axId.charAt(0);
     var cls = opts.cls || axId + 'tick';
 
-    var vals = ax.ticklabelstep > 1 ?
-        opts.vals.filter(function(d) { return !d.skipLabel; }) :
-        opts.vals;
+    var vals = opts.vals;
 
     var labelFns = opts.labelFns;
     var tickAngle = opts.secondary ? 0 : ax.tickangle;