@@ -1500,15 +1500,12 @@ function numFormat(v, ax, fmtoverride, hover) {
1500
1500
}
1501
1501
1502
1502
axes . getTickFormat = function ( ax ) {
1503
+ var i ;
1504
+
1503
1505
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 ;
1511
1507
}
1508
+
1512
1509
function compareLogTicks ( left , right ) {
1513
1510
var priority = [ 'L' , 'D' ] ;
1514
1511
if ( typeof left === typeof right ) {
@@ -1527,14 +1524,16 @@ axes.getTickFormat = function(ax) {
1527
1524
return typeof left === 'number' ? 1 : - 1 ;
1528
1525
}
1529
1526
}
1527
+
1530
1528
function isProperStop ( dtick , range , convert ) {
1531
1529
var convertFn = convert || function ( x ) { return x ; } ;
1532
1530
var leftDtick = range [ 0 ] ;
1533
1531
var rightDtick = range [ 1 ] ;
1534
1532
return ( ( ! leftDtick && typeof leftDtick !== 'number' ) || convertFn ( leftDtick ) <= convertFn ( dtick ) ) &&
1535
1533
( ( ! rightDtick && typeof rightDtick !== 'number' ) || convertFn ( rightDtick ) >= convertFn ( dtick ) ) ;
1536
1534
}
1537
- function isProperLogStop ( dtick , range ) {
1535
+
1536
+ function isProperLogStop ( dtick , range ) {
1538
1537
var isLeftDtickNull = range [ 0 ] === null ;
1539
1538
var isRightDtickNull = range [ 1 ] === null ;
1540
1539
var isDtickInRangeLeft = compareLogTicks ( dtick , range [ 0 ] ) >= 0 ;
@@ -1547,17 +1546,17 @@ axes.getTickFormat = function(ax) {
1547
1546
switch ( ax . type ) {
1548
1547
case 'date' :
1549
1548
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 ) ) {
1552
1551
tickstop = ax . tickformatstops [ i ] ;
1553
1552
break ;
1554
1553
}
1555
1554
}
1556
1555
break ;
1557
1556
}
1558
1557
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 ) ) {
1561
1560
tickstop = ax . tickformatstops [ i ] ;
1562
1561
break ;
1563
1562
}
0 commit comments