@@ -15,17 +15,11 @@ var arraysToCalcdata = require('./arrays_to_calcdata');
15
15
var calcSelection = require ( '../scatter/calc_selection' ) ;
16
16
17
17
module . exports = function calc ( gd , trace ) {
18
- // depending on bar direction, set position and size axes
19
- // and data ranges
20
- // note: this logic for choosing orientation is
21
- // duplicated in graph_obj->setstyles
18
+ var xa = Axes . getFromId ( gd , trace . xaxis || 'x' ) ;
19
+ var ya = Axes . getFromId ( gd , trace . yaxis || 'y' ) ;
20
+ var size , pos ;
22
21
23
- var xa = Axes . getFromId ( gd , trace . xaxis || 'x' ) ,
24
- ya = Axes . getFromId ( gd , trace . yaxis || 'y' ) ,
25
- orientation = trace . orientation || ( ( trace . x && ! trace . y ) ? 'h' : 'v' ) ,
26
- pos , size , i ;
27
-
28
- if ( orientation === 'h' ) {
22
+ if ( trace . orientation === 'h' ) {
29
23
size = xa . makeCalcdata ( trace , 'x' ) ;
30
24
pos = ya . makeCalcdata ( trace , 'y' ) ;
31
25
} else {
@@ -38,7 +32,7 @@ module.exports = function calc(gd, trace) {
38
32
var cd = new Array ( serieslen ) ;
39
33
40
34
// set position and size
41
- for ( i = 0 ; i < serieslen ; i ++ ) {
35
+ for ( var i = 0 ; i < serieslen ; i ++ ) {
42
36
cd [ i ] = { p : pos [ i ] , s : size [ i ] } ;
43
37
44
38
if ( trace . ids ) {
0 commit comments