@@ -682,10 +682,10 @@ axes.prepTicks = function(ax, opts) {
682
682
if ( ax . _name === 'radialaxis' ) nt *= 2 ;
683
683
}
684
684
685
- if ( ! ( ax . minor && ( ax . minor . tickmode !== 'array' && ax . minor . tickmode !== 'proportional ' ) ) ) {
685
+ if ( ! ( ax . minor && ( ax . minor . tickmode !== 'array' && ax . minor . tickmode !== 'domain array ' ) ) ) {
686
686
// add a couple of extra digits for filling in ticks when we
687
687
// have explicit tickvals without tick text
688
- if ( ax . tickmode === 'array' || ax . tickmode === 'proportional ' ) nt *= 100 ;
688
+ if ( ax . tickmode === 'array' || ax . tickmode === 'domain array ' ) nt *= 100 ;
689
689
}
690
690
691
691
ax . _roughDTick = Math . abs ( rng [ 1 ] - rng [ 0 ] ) / nt ;
@@ -949,13 +949,13 @@ axes.calcTicks = function calcTicks(ax, opts) {
949
949
axes . prepTicks ( mockAx , opts ) ;
950
950
}
951
951
952
- // tickmode 'proportional ' is just 'array' but with a pre-calc step
952
+ // tickmode 'domain array ' is just 'array' but with a pre-calc step
953
953
// original comment:
954
954
// now that we've figured out the auto values for formatting
955
955
// in case we're missing some ticktext, we can break out for array ticks
956
- if ( mockAx . tickmode === 'array' || mockAx . tickmode === 'proportional ' ) {
956
+ if ( mockAx . tickmode === 'array' || mockAx . tickmode === 'domain array ' ) {
957
957
// Mapping proportions to array:
958
- if ( mockAx . tickmode === 'proportional ' ) {
958
+ if ( mockAx . tickmode === 'domain array ' ) {
959
959
var width = ( maxRange - minRange ) ;
960
960
if ( axrev ) width *= - 1 ;
961
961
var offset = ! axrev ? minRange : maxRange ;
@@ -1248,7 +1248,7 @@ axes.calcTicks = function calcTicks(ax, opts) {
1248
1248
ticksOut [ 0 ] . noTick = true ;
1249
1249
}
1250
1250
1251
- // Reset tickvals back to proportional
1251
+ // Reset tickvals back to domain array
1252
1252
if ( tickFractionalVals . _isSet ) {
1253
1253
delete tickFractionalVals . _isSet ;
1254
1254
Lib . nestedProperty ( ax , 'tickvals' ) . set ( tickFractionalVals ) ;
@@ -1662,7 +1662,7 @@ axes.tickFirst = function(ax, opts) {
1662
1662
// more precision for hovertext
1663
1663
axes . tickText = function ( ax , x , hover , noSuffixPrefix ) {
1664
1664
var out = tickTextObj ( ax , x ) ;
1665
- var arrayMode = ( ax . tickmode === 'array' || ax . tickmode === 'proportional ' ) ;
1665
+ var arrayMode = ( ax . tickmode === 'array' || ax . tickmode === 'domain array ' ) ;
1666
1666
var extraPrecision = hover || arrayMode ;
1667
1667
var axType = ax . type ;
1668
1668
// TODO multicategory, if we allow ticktext / tickvals
@@ -3378,7 +3378,7 @@ axes.drawGrid = function(gd, ax, opts) {
3378
3378
3379
3379
var counterAx = opts . counterAxis ;
3380
3380
if ( counterAx && axes . shouldShowZeroLine ( gd , ax , counterAx ) ) {
3381
- var isArrayMode = ( ax . tickmode === 'array' || ax . tickmode === 'proportional ' ) ;
3381
+ var isArrayMode = ( ax . tickmode === 'array' || ax . tickmode === 'domain array ' ) ;
3382
3382
for ( var i = 0 ; i < majorVals . length ; i ++ ) {
3383
3383
var xi = majorVals [ i ] . x ;
3384
3384
if ( isArrayMode ? ! xi : ( Math . abs ( xi ) < ax . dtick / 100 ) ) {
0 commit comments