@@ -1500,15 +1500,12 @@ function numFormat(v, ax, fmtoverride, hover) {
15001500}
15011501
15021502axes . getTickFormat = function ( ax ) {
1503+ var i ;
1504+
15031505 function convertToMs ( dtick ) {
1504- return typeof dtick !== 'string' ? dtick : Number ( dtick . replace ( 'M' , '' ) * ONEAVGMONTH ) ;
1505- }
1506- function getRangeWidth ( range , convert ) {
1507- var convertFn = convert || function ( x ) { return x ; } ;
1508- var left = range [ 0 ] || 0 ;
1509- var right = range [ 1 ] || 0 ;
1510- return Math . abs ( convertFn ( right ) - convertFn ( left ) ) ;
1506+ return typeof dtick !== 'string' ? dtick : Number ( dtick . replace ( 'M' , '' ) ) * ONEAVGMONTH ;
15111507 }
1508+
15121509 function compareLogTicks ( left , right ) {
15131510 var priority = [ 'L' , 'D' ] ;
15141511 if ( typeof left === typeof right ) {
@@ -1527,14 +1524,16 @@ axes.getTickFormat = function(ax) {
15271524 return typeof left === 'number' ? 1 : - 1 ;
15281525 }
15291526 }
1527+
15301528 function isProperStop ( dtick , range , convert ) {
15311529 var convertFn = convert || function ( x ) { return x ; } ;
15321530 var leftDtick = range [ 0 ] ;
15331531 var rightDtick = range [ 1 ] ;
15341532 return ( ( ! leftDtick && typeof leftDtick !== 'number' ) || convertFn ( leftDtick ) <= convertFn ( dtick ) ) &&
15351533 ( ( ! rightDtick && typeof rightDtick !== 'number' ) || convertFn ( rightDtick ) >= convertFn ( dtick ) ) ;
15361534 }
1537- function isProperLogStop ( dtick , range ) {
1535+
1536+ function isProperLogStop ( dtick , range ) {
15381537 var isLeftDtickNull = range [ 0 ] === null ;
15391538 var isRightDtickNull = range [ 1 ] === null ;
15401539 var isDtickInRangeLeft = compareLogTicks ( dtick , range [ 0 ] ) >= 0 ;
@@ -1547,17 +1546,17 @@ axes.getTickFormat = function(ax) {
15471546 switch ( ax . type ) {
15481547 case 'date' :
15491548 case 'linear' : {
1550- for ( var i = 0 ; i < ax . tickformatstops . length ; i ++ ) {
1551- if ( isProperStop ( ax . dtick , ax . tickformatstops [ i ] . dtickrange , convertToMs ) ) {
1549+ for ( i = 0 ; i < ax . tickformatstops . length ; i ++ ) {
1550+ if ( isProperStop ( ax . dtick , ax . tickformatstops [ i ] . dtickrange , convertToMs ) ) {
15521551 tickstop = ax . tickformatstops [ i ] ;
15531552 break ;
15541553 }
15551554 }
15561555 break ;
15571556 }
15581557 case 'log' : {
1559- for ( var i = 0 ; i < ax . tickformatstops . length ; i ++ ) {
1560- if ( isProperLogStop ( ax . dtick , ax . tickformatstops [ i ] . dtickrange ) ) {
1558+ for ( i = 0 ; i < ax . tickformatstops . length ; i ++ ) {
1559+ if ( isProperLogStop ( ax . dtick , ax . tickformatstops [ i ] . dtickrange ) ) {
15611560 tickstop = ax . tickformatstops [ i ] ;
15621561 break ;
15631562 }
0 commit comments