Skip to content

Commit a5b202c

Browse files
authored
Merge pull request #7236 from plotly/drop-autotick
Drop deprecated `autotick` attributes from cartesian and gl3d axes
2 parents 2be6fcc + 61ac98f commit a5b202c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+83
-120
lines changed

draftlogs/7236_remove.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
- Drop deprecated autotick attributes from cartesian and gl3d axes [[#7236](https://github.com/plotly/plotly.js/pull/7236)]

src/plot_api/helpers.js

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -81,15 +81,6 @@ exports.cleanLayout = function(layout) {
8181

8282
// prune empty domain arrays made before the new nestedProperty
8383
if(emptyContainer(ax, 'domain')) delete ax.domain;
84-
85-
// autotick -> tickmode
86-
if(ax.autotick !== undefined) {
87-
if(ax.tickmode === undefined) {
88-
ax.tickmode = ax.autotick ? 'auto' : 'linear';
89-
}
90-
delete ax.autotick;
91-
}
92-
9384
}
9485
}
9586

src/plots/cartesian/layout_attributes.js

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1230,16 +1230,4 @@ module.exports = {
12301230
].join(' ')
12311231
},
12321232
editType: 'calc',
1233-
1234-
_deprecated: {
1235-
autotick: {
1236-
valType: 'boolean',
1237-
editType: 'ticks',
1238-
description: [
1239-
'Obsolete.',
1240-
'Set `tickmode` to *auto* for old `autotick` *true* behavior.',
1241-
'Set `tickmode` to *linear* for `autotick` *false*.'
1242-
].join(' ')
1243-
},
1244-
}
12451233
};

src/plots/cartesian/set_convert.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ function isValidCategory(v) {
5858
* Creates/updates these conversion functions, and a few more utilities
5959
* like cleanRange, and makeCalcdata
6060
*
61-
* also clears the autotick constraints ._minDtick, ._forceTick0
61+
* also clears ._minDtick, ._forceTick0
6262
*/
6363
module.exports = function setConvert(ax, fullLayout) {
6464
fullLayout = fullLayout || {};

src/plots/gl3d/layout/tick_marks.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ function computeTickMarks(scene) {
5252
axes.range[1] += 1;
5353
}
5454
// this is necessary to short-circuit the 'y' handling
55-
// in autotick part of calcTicks... Treating all axes as 'y' in this case
56-
// running the autoticks here, then setting
57-
// autoticks to false to get around the 2D handling in calcTicks.
55+
// in tickmode part of calcTicks... Treating all axes as 'y' in this case
56+
// running the tickmode here, then setting
57+
// automode to linear to get around the 2D handling in calcTicks.
5858
var tickModeCached = axes.tickmode;
5959
if(axes.tickmode === 'auto') {
6060
axes.tickmode = 'linear';

tasks/test_mock.mjs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,7 @@ function notBlackListed(name) {
144144
'32',
145145
'annotations',
146146
'annotations-autorange',
147-
'axes_booleans',
148147
'axes_labels',
149-
'axes-ticks',
150148
'candlestick_double-y-axis',
151149
'candlestick_rangeslider_thai',
152150
'category-autorange',
@@ -163,7 +161,6 @@ function notBlackListed(name) {
163161
'gl2d_14',
164162
'gl2d_17',
165163
'gl2d_annotations',
166-
'gl2d_axes_booleans',
167164
'gl2d_axes_labels',
168165
'gl2d_fill_trace_tozero_order',
169166
'gl2d_fonts',

test/image/mocks/11.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
"showgrid": true,
9797
"zeroline": false,
9898
"showline": false,
99-
"autotick": true,
99+
"tickmode": "auto",
100100
"nticks": 0,
101101
"ticks": "",
102102
"showticklabels": true,
@@ -140,7 +140,7 @@
140140
"showgrid": true,
141141
"zeroline": false,
142142
"showline": false,
143-
"autotick": true,
143+
"tickmode": "auto",
144144
"nticks": 0,
145145
"ticks": "",
146146
"showticklabels": true,

test/image/mocks/12.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@
376376
"showgrid": false,
377377
"zeroline": false,
378378
"showline": true,
379-
"autotick": true,
379+
"tickmode": "auto",
380380
"nticks": 0,
381381
"ticks": "",
382382
"showticklabels": true,
@@ -416,7 +416,7 @@
416416
"showgrid": false,
417417
"zeroline": false,
418418
"showline": true,
419-
"autotick": true,
419+
"tickmode": "auto",
420420
"nticks": 0,
421421
"ticks": "",
422422
"showticklabels": true,

test/image/mocks/13.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@
232232
"showgrid": true,
233233
"zeroline": true,
234234
"showline": true,
235-
"autotick": true,
235+
"tickmode": "auto",
236236
"nticks": 13,
237237
"ticks": "",
238238
"showticklabels": true,
@@ -272,7 +272,7 @@
272272
"showgrid": true,
273273
"zeroline": true,
274274
"showline": true,
275-
"autotick": true,
275+
"tickmode": "auto",
276276
"nticks": 13,
277277
"ticks": "",
278278
"showticklabels": true,

test/image/mocks/14.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"showgrid": true,
5555
"zeroline": true,
5656
"showline": false,
57-
"autotick": true,
57+
"tickmode": "auto",
5858
"nticks": 40,
5959
"ticks": "",
6060
"showticklabels": true,
@@ -95,7 +95,7 @@
9595
"showgrid": true,
9696
"zeroline": true,
9797
"showline": false,
98-
"autotick": true,
98+
"tickmode": "auto",
9999
"nticks": 6,
100100
"ticks": "",
101101
"showticklabels": true,

0 commit comments

Comments
 (0)