fix issue 4848 - tickmode array on date and log axes

Author: archmoj

src/plots/cartesian/tick_value_defaults.js

@@ -21,18 +21,11 @@ module.exports = function handleTickValueDefaults(containerIn, containerOut, coe
     var _tick0 = readInput('tick0');
     var _dtick = readInput('dtick');
     var _tickvals = readInput('tickvals');
-    var _tickmode = readInput('tickmode');
-    var tickmode;
 
-    if(_tickmode === 'array' &&
-            (axType === 'log' || axType === 'date')) {
-        tickmode = containerOut.tickmode = 'auto';
-    } else {
-        var tickmodeDefault = Array.isArray(_tickvals) ? 'array' :
-            _dtick ? 'linear' :
-            'auto';
-        tickmode = coerce('tickmode', tickmodeDefault);
-    }
+    var tickmodeDefault = Array.isArray(_tickvals) ? 'array' :
+        _dtick ? 'linear' :
+        'auto';
+    var tickmode = coerce('tickmode', tickmodeDefault);
 
     if(tickmode === 'auto') coerce('nticks');
     else if(tickmode === 'linear') {

test/jasmine/tests/axes_test.js

@@ -1887,10 +1887,16 @@ describe('Test axes', function() {
                 expect(axOut.tickmode).toBe('auto');
                 expect(axIn.tickmode).toBe('array');
 
+                axIn = {tickvals: [1, 2, 3]};
+                axOut = {};
+                mockSupplyDefaults(axIn, axOut, 'date');
+                expect(axOut.tickmode).toBe('array');
+                expect(axIn.tickmode).toBeUndefined();
+
                 axIn = {tickmode: 'array', tickvals: [1, 2, 3]};
                 axOut = {};
                 mockSupplyDefaults(axIn, axOut, 'date');
-                expect(axOut.tickmode).toBe('auto');
+                expect(axOut.tickmode).toBe('array');
                 expect(axIn.tickmode).toBe('array');
 
                 axIn = {tickvals: [1, 2, 3]};