File tree 2 files changed +17
-21
lines changed
2 files changed +17
-21
lines changed Original file line number Diff line number Diff line change @@ -15,6 +15,19 @@ var extendFlat = require('../../lib/extend').extendFlat;
15
15
var scatterMarkerAttrs = scatterAttrs . marker ;
16
16
var scatterMarkerLineAttrs = scatterMarkerAttrs . line ;
17
17
18
+ var markerLineWidth = extendFlat ( { } ,
19
+ scatterMarkerLineAttrs . width , { dflt : 0 } ) ;
20
+
21
+ var markerLine = extendFlat ( { } , {
22
+ width : markerLineWidth
23
+ } , colorAttributes ( 'marker.line' ) ) ;
24
+
25
+ var marker = extendFlat ( { } , {
26
+ showscale : scatterMarkerAttrs . showscale ,
27
+ line : markerLine
28
+ } , colorAttributes ( 'marker' ) ) ;
29
+
30
+
18
31
module . exports = {
19
32
x : scatterAttrs . x ,
20
33
x0 : scatterAttrs . x0 ,
@@ -23,6 +36,7 @@ module.exports = {
23
36
y0 : scatterAttrs . y0 ,
24
37
dy : scatterAttrs . dy ,
25
38
text : scatterAttrs . text ,
39
+
26
40
orientation : {
27
41
valType : 'enumerated' ,
28
42
role : 'info' ,
@@ -33,14 +47,8 @@ module.exports = {
33
47
'along the vertical (horizontal).'
34
48
] . join ( ' ' )
35
49
} ,
36
- marker : extendFlat ( { } , {
37
- showscale : scatterMarkerAttrs . showscale ,
38
- line : extendFlat ( { } ,
39
- { width : scatterMarkerLineAttrs . width } ,
40
- colorAttributes ( 'marker.line' )
41
- ) } ,
42
- colorAttributes ( 'marker' )
43
- ) ,
50
+
51
+ marker : marker ,
44
52
45
53
r : scatterAttrs . r ,
46
54
t : scatterAttrs . t ,
Original file line number Diff line number Diff line change 9
9
'use strict' ;
10
10
11
11
var barAttrs = require ( '../bar/attributes' ) ;
12
- var colorAttributes = require ( '../../components/colorscale/color_attributes' ) ;
13
12
14
- var extendFlat = require ( '../../lib/extend' ) . extendDeep ;
15
-
16
- var barMarkerAttrs = barAttrs . marker ;
17
- var barMarkerLineAttrs = barMarkerAttrs . line ;
18
13
19
14
module . exports = {
20
15
x : {
@@ -124,14 +119,7 @@ module.exports = {
124
119
} ,
125
120
ybins : makeBinsAttr ( 'y' ) ,
126
121
127
- marker : extendFlat ( { } , {
128
- showscale : barMarkerAttrs . showscale ,
129
- line : extendFlat ( { } ,
130
- { width : extendFlat ( { } , barMarkerLineAttrs . width , { dflt : 0 } ) } ,
131
- colorAttributes ( 'marker.line' ) )
132
- } ,
133
- colorAttributes ( 'marker' )
134
- ) ,
122
+ marker : barAttrs . marker ,
135
123
136
124
_nestedModules : {
137
125
'error_y' : 'ErrorBars' ,
You can’t perform that action at this time.
0 commit comments