@@ -1035,28 +1035,28 @@ describe('calculated data and points', function() {
1035
1035
} ) ;
1036
1036
}
1037
1037
1038
- supportedCartesianTraces . forEach ( function ( trace ) {
1038
+ supportedCartesianTraces . forEach ( function ( trace ) {
1039
1039
[ 'xaxis' , 'yaxis' ] . forEach ( function ( axName ) {
1040
1040
if ( axName === 'yaxis' && oneOrientationTraces . indexOf ( trace . type ) !== - 1 ) return ;
1041
1041
1042
- function checkAggregatedValue ( baseMock , expectedAgg , finalOrder , done ) {
1042
+ function checkAggregatedValue ( baseMock , expectedAgg , finalOrder , done ) {
1043
1043
var mock = Lib . extendDeep ( { } , baseMock ) ;
1044
-
1044
+
1045
1045
if ( mock . data [ 0 ] . type . match ( / h i s t o g r a m / ) ) {
1046
1046
for ( i = 0 ; i < mock . data . length ; i ++ ) {
1047
1047
mock . data [ i ] [ axName === 'yaxis' ? 'y' : 'x' ] . push ( 'a' ) ;
1048
- mock . data [ i ] [ axName === 'yaxis' ? 'x' : 'y' ] . push ( 7 ) ;
1048
+ mock . data [ i ] [ axName === 'yaxis' ? 'x' : 'y' ] . push ( 7 ) ;
1049
1049
}
1050
1050
}
1051
-
1051
+
1052
1052
Plotly . newPlot ( gd , mock )
1053
- . then ( function ( gd ) {
1053
+ . then ( function ( gd ) {
1054
1054
var agg = gd . _fullLayout [ trace . type === 'splom' ? 'xaxis' : axName ] . _categoriesAggregatedValue . sort ( function ( a , b ) {
1055
1055
return a [ 0 ] > b [ 0 ] ? 1 : - 1 ;
1056
1056
} ) ;
1057
1057
expect ( agg ) . toEqual ( expectedAgg , 'wrong aggregation for ' + axName ) ;
1058
1058
1059
- if ( finalOrder ) {
1059
+ if ( finalOrder ) {
1060
1060
expect ( gd . _fullLayout [ trace . type === 'splom' ? 'xaxis' : axName ] . _categories ) . toEqual ( finalOrder , 'wrong order' ) ;
1061
1061
}
1062
1062
} )
@@ -1074,13 +1074,13 @@ describe('calculated data and points', function() {
1074
1074
if ( categoryorder === 'total descending' ) finalOrder . reverse ( ) ;
1075
1075
var expectedAgg = [ [ 'a' , 7 ] , [ 'b' , 2 ] , [ 'c' , 3 ] ] ;
1076
1076
1077
- if ( trace . type === 'ohlc' || trace . type === 'candlestick' ) {
1077
+ if ( trace . type === 'ohlc' || trace . type === 'candlestick' ) {
1078
1078
expectedAgg = [ [ 'a' , 14 ] , [ 'b' , 4 ] , [ 'c' , 6 ] ] ;
1079
- if ( categoryorder === 'total descending' ) finalOrder = [ 'a' , 'c' , 'b' ]
1079
+ if ( categoryorder === 'total descending' ) finalOrder = [ 'a' , 'c' , 'b' ] ;
1080
1080
}
1081
- if ( trace . type . match ( / h i s t o g r a m / ) ) {
1081
+ if ( trace . type . match ( / h i s t o g r a m / ) ) {
1082
1082
expectedAgg = [ [ 'a' , 2 ] , [ 'b' , 1 ] , [ 'c' , 1 ] ] ;
1083
- if ( categoryorder === 'total descending' ) finalOrder = [ 'a' , 'b' , 'c' ]
1083
+ if ( categoryorder === 'total descending' ) finalOrder = [ 'a' , 'b' , 'c' ] ;
1084
1084
}
1085
1085
1086
1086
checkAggregatedValue ( baseMock , expectedAgg , finalOrder , done ) ;
0 commit comments