@@ -829,18 +829,25 @@ axes.calcTicks = function calcTicks(ax, opts) {
829
829
}
830
830
}
831
831
832
+ var id = - 1 ;
833
+
832
834
if ( isPeriod ) {
833
835
// add one item to label period before tick0
834
836
x = axes . tickIncrement ( x , ax . dtick , ! axrev , ax . calendar ) ;
837
+ id -- ;
835
838
}
836
839
840
+ var ticklabeljump = ax . ticklabeljump ;
841
+
837
842
var maxTicks = Math . max ( 1000 , ax . _length || 0 ) ;
838
843
var tickVals = [ ] ;
839
844
var xPrevious = null ;
840
845
for ( ;
841
846
( axrev ) ? ( x >= endTick ) : ( x <= endTick ) ;
842
847
x = axes . tickIncrement ( x , ax . dtick , axrev , ax . calendar )
843
848
) {
849
+ id ++ ;
850
+
844
851
if ( ax . rangebreaks ) {
845
852
if ( ! axrev ) {
846
853
if ( x < startTick ) continue ;
@@ -858,10 +865,16 @@ axes.calcTicks = function calcTicks(ax, opts) {
858
865
minor = true ;
859
866
}
860
867
861
- tickVals . push ( {
868
+ var obj = {
862
869
minor : minor ,
863
870
value : x
864
- } ) ;
871
+ } ;
872
+
873
+ if ( ticklabeljump && ( id % ( ticklabeljump + 1 ) ) ) {
874
+ obj . jumpLabel = true ;
875
+ }
876
+
877
+ tickVals . push ( obj ) ;
865
878
}
866
879
867
880
if ( isPeriod ) positionPeriodTicks ( tickVals , ax , ax . _definedDelta ) ;
@@ -927,6 +940,10 @@ axes.calcTicks = function calcTicks(ax, opts) {
927
940
_minor // noSuffixPrefix
928
941
) ;
929
942
943
+ if ( tickVals [ i ] . jumpLabel ) {
944
+ t . jumpLabel = true ;
945
+ }
946
+
930
947
p = tickVals [ i ] . periodX ;
931
948
if ( p !== undefined ) {
932
949
t . periodX = p ;
@@ -2967,9 +2984,8 @@ axes.drawLabels = function(gd, ax, opts) {
2967
2984
var axLetter = axId . charAt ( 0 ) ;
2968
2985
var cls = opts . cls || axId + 'tick' ;
2969
2986
2970
- var jump = ax . ticklabeljump ;
2971
- var vals = jump ?
2972
- opts . vals . filter ( function ( _ , i ) { return i % ( jump + 1 ) === 0 ; } ) :
2987
+ var vals = ax . ticklabeljump ?
2988
+ opts . vals . filter ( function ( d ) { return ! d . jumpLabel ; } ) :
2973
2989
opts . vals ;
2974
2990
2975
2991
var labelFns = opts . labelFns ;
0 commit comments