Revert "redo PR 6120"

This reverts commit 6325990.

Author: archmoj

src/plots/cartesian/axes.js

@@ -674,8 +674,7 @@ axes.prepTicks = function(ax, opts) {
                 minPx = ax.tickfont ? Lib.bigFont(ax.tickfont.size || 12) : 15;
                 nt = ax._length / minPx;
             } else {
-                minPx = ax._id.charAt(0) === 'y' ? 40 :
-                    ax.loglabels === 'full value' ? 100 : 80;
+                minPx = ax._id.charAt(0) === 'y' ? 40 : 80;
                 nt = Lib.constrain(ax._length / minPx, 4, 9) + 1;
             }
 
@@ -1239,10 +1238,6 @@ axes.calcTicks = function calcTicks(ax, opts) {
         return text;
     }
 
-    var skipText1 = /^[346789]/; // for x-axis and tick length >= 3
-    var skipText2 = /^[4689]/;   // for tick length < 3
-    var logFullValue = ax.loglabels === 'full value' && ax.dtick == 'D1';
-
     var t;
     for(i = 0; i < tickVals.length; i++) {
         var _minor = tickVals[i].minor;
@@ -1264,14 +1259,6 @@ axes.calcTicks = function calcTicks(ax, opts) {
                 hideLabel(t);
             }
 
-            if(logFullValue && ax._attr && (
-                (ax._attr[0] === 'y' && t.text.match(skipText2)) ||
-                (ax._attr[0] === 'x' && t.text.length < 3 && t.text.match(skipText2)) ||
-                (ax._attr[0] === 'x' && t.text.length >=3 && t.text.match(skipText1))
-            )) {
-                hideLabel(t);
-            }
-
             ticksOut.push(t);
         }
     }
@@ -1483,14 +1470,11 @@ axes.autoTicks = function(ax, roughDTick, isMinor) {
                 Math.pow(10, rng[0])) / nt;
             base = getBase(10);
             ax.dtick = 'L' + roundDTick(roughDTick, base, roundBase10);
-            ax.tickformat = '';
         } else {
             // include intermediates between powers of 10,
             // labeled with small digits
             // ax.dtick = "D2" (show 2 and 5) or "D1" (show all digits)
-            ax.dtick = (roughDTick > (ax.loglabels === 'full value' ? 0.4 : 0.3)) ? 'D2' : 'D1';
-            ax.tickformat = '0.1s';
-            ax.hoverformat = '0.2s'; // workaround to fix hoverinfo label formatting
+            ax.dtick = (roughDTick > 0.3) ? 'D2' : 'D1';
         }
     } else if(ax.type === 'category' || ax.type === 'multicategory') {
         ax.tick0 = 0;
@@ -3786,7 +3770,7 @@ axes.drawLabels = function(gd, ax, opts) {
 
                     var sel;
                     if(e.K === ZERO_PATH.K) {
-                        var zerolineLayer = zerolineIsAbove ? mainPlotinfo.zerolinelayerAbove : mainPlotinfo.zerolinelayer;
+                        var zerolineLayer = zerolineIsAbove ? mainPlotinfo.zerolinelayerAbove : mainPlotinfo.zerolinelayer; 
                         sel = zerolineLayer.selectAll('.' + ax._id + 'zl');
                     } else if(e.K === MINORGRID_PATH.K) sel = mainPlotinfo.minorGridlayer.selectAll('.' + ax._id);
                     else if(e.K === GRID_PATH.K) sel = mainPlotinfo.gridlayer.selectAll('.' + ax._id);