|
10 | 10 |
|
11 | 11 | var scatterAttrs = require('../scatter/attributes');
|
12 | 12 | var plotAttrs = require('../../plots/attributes');
|
| 13 | +var colorAttributes = require('../../components/colorscale/color_attributes'); |
| 14 | + |
13 | 15 | var extendFlat = require('../../lib/extend').extendFlat;
|
| 16 | +var extendDeep = require('../../lib/extend').extendDeep; |
14 | 17 |
|
15 | 18 | var scatterMarkerAttrs = scatterAttrs.marker,
|
16 | 19 | scatterLineAttrs = scatterAttrs.line,
|
@@ -95,33 +98,19 @@ module.exports = {
|
95 | 98 | ].join(' ')
|
96 | 99 | }),
|
97 | 100 | fillcolor: scatterAttrs.fillcolor,
|
98 |
| - marker: { |
| 101 | + marker: extendDeep({}, colorAttributes('marker'), { |
99 | 102 | symbol: scatterMarkerAttrs.symbol,
|
100 | 103 | opacity: scatterMarkerAttrs.opacity,
|
101 | 104 | maxdisplayed: scatterMarkerAttrs.maxdisplayed,
|
102 | 105 | size: scatterMarkerAttrs.size,
|
103 | 106 | sizeref: scatterMarkerAttrs.sizeref,
|
104 | 107 | sizemin: scatterMarkerAttrs.sizemin,
|
105 | 108 | sizemode: scatterMarkerAttrs.sizemode,
|
106 |
| - color: scatterMarkerAttrs.color, |
107 |
| - colorscale: scatterMarkerAttrs.colorscale, |
108 |
| - cauto: scatterMarkerAttrs.cauto, |
109 |
| - cmax: scatterMarkerAttrs.cmax, |
110 |
| - cmin: scatterMarkerAttrs.cmin, |
111 |
| - autocolorscale: scatterMarkerAttrs.autocolorscale, |
112 |
| - reversescale: scatterMarkerAttrs.reversescale, |
113 | 109 | showscale: scatterMarkerAttrs.showscale,
|
114 |
| - line: { |
115 |
| - color: scatterMarkerLineAttrs.color, |
116 |
| - width: scatterMarkerLineAttrs.width, |
117 |
| - colorscale: scatterMarkerLineAttrs.colorscale, |
118 |
| - cauto: scatterMarkerLineAttrs.cauto, |
119 |
| - cmax: scatterMarkerLineAttrs.cmax, |
120 |
| - cmin: scatterMarkerLineAttrs.cmin, |
121 |
| - autocolorscale: scatterMarkerLineAttrs.autocolorscale, |
122 |
| - reversescale: scatterMarkerLineAttrs.reversescale |
123 |
| - } |
124 |
| - }, |
| 110 | + line: extendDeep({}, colorAttributes('marker'.line), { |
| 111 | + width: scatterMarkerLineAttrs.width |
| 112 | + }) |
| 113 | + }), |
125 | 114 | textfont: scatterAttrs.textfont,
|
126 | 115 | textposition: scatterAttrs.textposition,
|
127 | 116 | hoverinfo: extendFlat({}, plotAttrs.hoverinfo, {
|
|
0 commit comments