Skip to content

Commit 4fd274a

Browse files
committed
mv colorscale attributes out of colorbar/ into colorscale/
1 parent 55e203a commit 4fd274a

File tree

7 files changed

+30
-30
lines changed

7 files changed

+30
-30
lines changed

src/components/colorbar/colorbar.js

-2
Original file line numberDiff line numberDiff line change
@@ -592,5 +592,3 @@ colorbar.traceColorbar = function(gd, cd) {
592592

593593
Plotly.Lib.markTime('done colorbar');
594594
};
595-
596-
colorbar.traceColorbarAttributes = require('./trace_attributes');

src/components/colorscale/colorscale.js

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ var colorscale = module.exports = {};
1010
colorscale.scales = require('./scales');
1111
colorscale.defaultScale = colorscale.scales.RdBu;
1212

13+
colorscale.attributes = require('./attributes');
14+
1315
function isValidScaleArray(scl) {
1416
var isValid = true,
1517
highestVal = 0,

src/traces/choropleth/attributes.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
var ScatterGeoAttrs = require('../scattergeo/attributes');
2-
var traceColorbarAttrs = require('../../components/colorbar/trace_attributes');
2+
var colorscaleAttrs = require('../../components/colorscale/attributes');
33
var plotAttrs = require('../../plots/plots/attributes');
44
var extendFlat = require('../../lib/extend').extendFlat;
55

@@ -28,13 +28,13 @@ module.exports = {
2828
width: ScatterGeoMarkerLineAttrs.width
2929
}
3030
},
31-
zauto: traceColorbarAttrs.zauto,
32-
zmin: traceColorbarAttrs.zmin,
33-
zmax: traceColorbarAttrs.zmax,
34-
colorscale: traceColorbarAttrs.colorscale,
35-
autocolorscale: traceColorbarAttrs.autocolorscale,
36-
reversescale: traceColorbarAttrs.reversescale,
37-
showscale: traceColorbarAttrs.showscale,
31+
zauto: colorscaleAttrs.zauto,
32+
zmin: colorscaleAttrs.zmin,
33+
zmax: colorscaleAttrs.zmax,
34+
colorscale: colorscaleAttrs.colorscale,
35+
autocolorscale: colorscaleAttrs.autocolorscale,
36+
reversescale: colorscaleAttrs.reversescale,
37+
showscale: colorscaleAttrs.showscale,
3838
hoverinfo: extendFlat({}, plotAttrs.hoverinfo, {
3939
flags: ['location', 'z', 'text', 'name']
4040
}),

src/traces/heatmap/attributes.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
var scatterAttrs = require('../scatter/attributes');
2-
var traceColorbarAttrs = require('../../components/colorbar/trace_attributes');
2+
var colorscaleAttrs = require('../../components/colorscale/attributes');
33

44
var extendFlat = require('../../lib/extend').extendFlat;
55

@@ -47,14 +47,14 @@ module.exports = {
4747
'(the default behavior when `y` is not provided)'
4848
].join(' ')
4949
},
50-
zauto: traceColorbarAttrs.zauto,
51-
zmin: traceColorbarAttrs.zmin,
52-
zmax: traceColorbarAttrs.zmax,
53-
colorscale: traceColorbarAttrs.colorscale,
54-
autocolorscale: extendFlat({}, traceColorbarAttrs.autocolorscale,
50+
zauto: colorscaleAttrs.zauto,
51+
zmin: colorscaleAttrs.zmin,
52+
zmax: colorscaleAttrs.zmax,
53+
colorscale: colorscaleAttrs.colorscale,
54+
autocolorscale: extendFlat({}, colorscaleAttrs.autocolorscale,
5555
{dflt: false}),
56-
reversescale: traceColorbarAttrs.reversescale,
57-
showscale: traceColorbarAttrs.showscale,
56+
reversescale: colorscaleAttrs.reversescale,
57+
showscale: colorscaleAttrs.showscale,
5858
zsmooth: {
5959
valType: 'enumerated',
6060
values: ['fast', 'best', false],

src/traces/mesh3d/attributes.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
var traceColorbarAttrs = require('../../components/colorbar/trace_attributes');
1+
var colorscaleAttrs = require('../../components/colorscale/attributes');
22

33
module.exports = {
44
x: {valType: 'data_array'},
@@ -74,9 +74,9 @@ module.exports = {
7474
}
7575
},
7676

77-
colorscale: traceColorbarAttrs.colorscale,
78-
reversescale: traceColorbarAttrs.reversescale,
79-
showscale: traceColorbarAttrs.showscale,
77+
colorscale: colorscaleAttrs.colorscale,
78+
reversescale: colorscaleAttrs.reversescale,
79+
showscale: colorscaleAttrs.showscale,
8080

8181
lighting: {
8282
ambient: {

src/traces/surface/attributes.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
var traceColorbarAttrs = require('../../components/colorbar/trace_attributes');
3+
var colorscaleAttrs = require('../../components/colorscale/attributes');
44
var extendFlat = require('../../lib/extend').extendFlat;
55

66

@@ -86,14 +86,14 @@ module.exports = {
8686
valType: 'data_array',
8787
description: 'Sets the text elements associated with each z value.'
8888
},
89-
zauto: traceColorbarAttrs.zauto,
90-
zmin: traceColorbarAttrs.zmin,
91-
zmax: traceColorbarAttrs.zmax,
92-
colorscale: traceColorbarAttrs.colorscale,
93-
autocolorscale: extendFlat({}, traceColorbarAttrs.autocolorscale,
89+
zauto: colorscaleAttrs.zauto,
90+
zmin: colorscaleAttrs.zmin,
91+
zmax: colorscaleAttrs.zmax,
92+
colorscale: colorscaleAttrs.colorscale,
93+
autocolorscale: extendFlat({}, colorscaleAttrs.autocolorscale,
9494
{dflt: false}),
95-
reversescale: traceColorbarAttrs.reversescale,
96-
showscale: traceColorbarAttrs.showscale,
95+
reversescale: colorscaleAttrs.reversescale,
96+
showscale: colorscaleAttrs.showscale,
9797
contours: {
9898
x: makeContourAttr('x'),
9999
y: makeContourAttr('y'),

0 commit comments

Comments
 (0)