should not move by a week or quarter when the labels are not weekly o…

…r quarterly
plotly · Aug 19, 2020 · beed352 · beed352
1 parent b318e8b
commit beed352
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/src/plots/cartesian/axes.js b/src/plots/cartesian/axes.js
@@ -791,22 +791,17 @@ axes.calcTicks = function calcTicks(ax, opts) {
                 } else {
                     periodLength = ONEAVGYEAR;
                 }
-            } else if(delta >= ONEMINQUARTER) {
-                if(
-                    definedDelta && // case of specified by tickfomat
-                    actualDelta >= ONEMINQUARTER && actualDelta <= ONEMAXQUARTER
-                ) {
+            } else if(definedDelta === ONEAVGQUARTER && delta >= ONEMINQUARTER) {
+                if(actualDelta >= ONEMINQUARTER && actualDelta <= ONEMAXQUARTER) {
                     periodLength = actualDelta;
-                } else {
-                    periodLength = ONEAVGQUARTER;
                 }
             } else if(delta >= ONEMINMONTH) {
                 if(actualDelta >= ONEMINMONTH && actualDelta <= ONEMAXMONTH) {
                     periodLength = actualDelta;
                 } else {
                     periodLength = ONEAVGMONTH;
                 }
-            } else if(delta >= ONEWEEK) {
+            } else if(definedDelta === ONEWEEK && delta >= ONEWEEK) {
                 periodLength = ONEWEEK;
             } else if(delta >= ONEDAY) {
                 periodLength = ONEDAY;

diff --git a/test/image/baselines/date_axes_period.png b/test/image/baselines/date_axes_period.png