|
10 | 10 | 'use strict';
|
11 | 11 |
|
12 | 12 | var barAttrs = require('../bar/attributes');
|
| 13 | +var colorAttributes = require('../../components/colorscale/color_attributes'); |
| 14 | + |
13 | 15 | var extendFlat = require('../../lib').extendFlat;
|
| 16 | +var extendDeep = require('../../lib/extend').extendDeep; |
14 | 17 |
|
15 | 18 | var barMarkerAttrs = barAttrs.marker;
|
16 | 19 | var barMarkerLineAttrs = barMarkerAttrs.line;
|
@@ -112,26 +115,12 @@ module.exports = {
|
112 | 115 | },
|
113 | 116 | ybins: makeBinsAttr('y'),
|
114 | 117 |
|
115 |
| - marker: { |
116 |
| - color: barMarkerAttrs.color, |
117 |
| - colorscale: barMarkerAttrs.colorscale, |
118 |
| - cauto: barMarkerAttrs.cauto, |
119 |
| - cmax: barMarkerAttrs.cmax, |
120 |
| - cmin: barMarkerAttrs.cmin, |
121 |
| - autocolorscale: barMarkerAttrs.autocolorscale, |
122 |
| - reversescale: barMarkerAttrs.reversescale, |
| 118 | + marker: extendDeep({}, colorAttributes('marker'), { |
123 | 119 | showscale: barMarkerAttrs.showscale,
|
124 |
| - line: { |
125 |
| - color: barMarkerLineAttrs.color, |
126 |
| - colorscale: barMarkerLineAttrs.colorscale, |
127 |
| - cauto: barMarkerLineAttrs.cauto, |
128 |
| - cmax: barMarkerLineAttrs.cmax, |
129 |
| - cmin: barMarkerLineAttrs.cmin, |
130 |
| - autocolorscale: barMarkerLineAttrs.autocolorscale, |
131 |
| - reversescale: barMarkerLineAttrs.reversescale, |
| 120 | + line: extendDeep({}, colorAttributes('marker.line'), { |
132 | 121 | width: extendFlat({}, barMarkerLineAttrs.width, {dflt: 0})
|
133 |
| - } |
134 |
| - }, |
| 122 | + }) |
| 123 | + }), |
135 | 124 |
|
136 | 125 | _nestedModules: {
|
137 | 126 | 'error_y': 'ErrorBars',
|
|
0 commit comments