@@ -28,25 +28,25 @@ module.exports = function style(s) {
28
28
. selectAll ( 'g.legendfill' )
29
29
. data ( [ d ] ) ;
30
30
fill . enter ( ) . append ( 'g' )
31
- . classed ( 'legendfill' , true ) ;
31
+ . classed ( 'legendfill' , true ) ;
32
32
33
33
var line = traceGroup
34
34
. selectAll ( 'g.legendlines' )
35
35
. data ( [ d ] ) ;
36
36
line . enter ( ) . append ( 'g' )
37
- . classed ( 'legendlines' , true ) ;
37
+ . classed ( 'legendlines' , true ) ;
38
38
39
39
var symbol = traceGroup
40
40
. selectAll ( 'g.legendsymbols' )
41
41
. data ( [ d ] ) ;
42
42
symbol . enter ( ) . append ( 'g' )
43
- . classed ( 'legendsymbols' , true ) ;
43
+ . classed ( 'legendsymbols' , true ) ;
44
44
symbol . style ( 'opacity' , d [ 0 ] . trace . opacity ) ;
45
45
46
46
symbol . selectAll ( 'g.legendpoints' )
47
47
. data ( [ d ] )
48
48
. enter ( ) . append ( 'g' )
49
- . classed ( 'legendpoints' , true ) ;
49
+ . classed ( 'legendpoints' , true ) ;
50
50
} )
51
51
. each ( styleBars )
52
52
. each ( styleBoxes )
@@ -62,14 +62,14 @@ function styleLines(d) {
62
62
63
63
var fill = d3 . select ( this ) . select ( '.legendfill' ) . selectAll ( 'path' )
64
64
. data ( showFill ? [ d ] : [ ] ) ;
65
- fill . enter ( ) . append ( 'path' ) . classed ( 'js-fill' , true ) ;
65
+ fill . enter ( ) . append ( 'path' ) . classed ( 'js-fill' , true ) ;
66
66
fill . exit ( ) . remove ( ) ;
67
67
fill . attr ( 'd' , 'M5,0h30v6h-30z' )
68
68
. call ( Drawing . fillGroupStyle ) ;
69
69
70
70
var line = d3 . select ( this ) . select ( '.legendlines' ) . selectAll ( 'path' )
71
71
. data ( showLine ? [ d ] : [ ] ) ;
72
- line . enter ( ) . append ( 'path' ) . classed ( 'js-line' , true )
72
+ line . enter ( ) . append ( 'path' ) . classed ( 'js-line' , true )
73
73
. attr ( 'd' , 'M5,0h30' ) ;
74
74
line . exit ( ) . remove ( ) ;
75
75
line . call ( Drawing . lineGroupStyle ) ;
@@ -161,20 +161,22 @@ function stylePoints(d) {
161
161
162
162
function styleBars ( d ) {
163
163
var trace = d [ 0 ] . trace ,
164
- marker = trace . marker || { } ,
165
- markerLine = marker . line || { } ,
164
+ marker = trace . marker || { } ,
165
+ markerLine = marker . line || { } ,
166
166
barpath = d3 . select ( this ) . select ( 'g.legendpoints' )
167
167
. selectAll ( 'path.legendbar' )
168
168
. data ( Plots . traceIs ( trace , 'bar' ) ? [ d ] : [ ] ) ;
169
- barpath . enter ( ) . append ( 'path' ) . classed ( 'legendbar' , true )
169
+ barpath . enter ( ) . append ( 'path' ) . classed ( 'legendbar' , true )
170
170
. attr ( 'd' , 'M6,6H-6V-6H6Z' )
171
- . attr ( 'transform' , 'translate(20,0)' ) ;
171
+ . attr ( 'transform' , 'translate(20,0)' ) ;
172
172
barpath . exit ( ) . remove ( ) ;
173
173
barpath . each ( function ( d ) {
174
- var w = ( d . mlw + 1 || markerLine . width + 1 ) - 1 ,
174
+ var w = ( d . mlw + 1 || markerLine . width + 1 ) - 1 ,
175
175
p = d3 . select ( this ) ;
176
+
176
177
p . style ( 'stroke-width' , w + 'px' )
177
178
. call ( Color . fill , d . mc || marker . color ) ;
179
+
178
180
if ( w ) {
179
181
p . call ( Color . stroke , d . mlc || markerLine . color ) ;
180
182
}
@@ -192,10 +194,12 @@ function styleBoxes(d) {
192
194
. attr ( 'transform' , 'translate(20,0)' ) ;
193
195
pts . exit ( ) . remove ( ) ;
194
196
pts . each ( function ( d ) {
195
- var w = ( d . lw + 1 || trace . line . width + 1 ) - 1 ,
197
+ var w = ( d . lw + 1 || trace . line . width + 1 ) - 1 ,
196
198
p = d3 . select ( this ) ;
199
+
197
200
p . style ( 'stroke-width' , w + 'px' )
198
201
. call ( Color . fill , d . fc || trace . fillcolor ) ;
202
+
199
203
if ( w ) {
200
204
p . call ( Color . stroke , d . lc || trace . line . color ) ;
201
205
}
0 commit comments