8000 DRY up color attributes by monfera · Pull Request #609 · plotly/plotly.js · GitHub
[go: up one dir, main page]
Skip to content

DRY up color attributes #609

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Jun 7, 2016
Merged

DRY up color attributes #609

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
d226c7a
581a dry colors - new, central place
monfera Jun 7, 2016
7e7a6db
581a dry colors - scatter3d
monfera Jun 7, 2016
689a680
581a dry colors - scattergl
monfera Jun 7, 2016
dc2f6f4
581a dry colors - scatter
monfera Jun 7, 2016
9f0cd81
581a dry colors - scattergeo
monfera Jun 7, 2016
90e438a
581a dry colors - scatterternary
monfera Jun 7, 2016
40a51f2
581a dry colors - histogram
monfera Jun 7, 2016
eb4d42a
581a dry colors - bar
monfera Jun 7, 2016
b0c4d32
581a dry colors - share between color_attributes and attributes
monfera Jun 7, 2016
4aed9b4
581a dry colors - heatmap
monfera Jun 7, 2016
99abf13
581a dry colors - choropleth
monfera Jun 7, 2016
e5222d0
581a dry colors - histogram2d, histogram2dcontour
monfera Jun 7, 2016
bc9f70a
581a dry colors - contour
monfera Jun 7, 2016
7e89f81
581a dry colors - post review changes
monfera Jun 7, 2016
01d1041
581a dry colors - put color spec as the last prop block; use extendFl…
monfera Jun 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
581a dry colors - scatter
  • Loading branch information
@monfera
monfera committed Jun 7, 2016
commit dc2f6f4d1ac635ab55d9486aed12b474bb7df721
168 changes: 8 additions & 160 deletions src/traces/scatter/attributes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,14 @@

'use strict';

var colorAttributes = require('../../components/colorscale/color_attributes');

var Drawing = require('../../components/drawing');

var constants = require('./constants');

var extendDeep = require('../../lib/extend').extendDeep;


module.exports = {
x: {
Expand Down Expand Up @@ -181,7 +185,7 @@ module.exports = {
'marker color, or marker line color, whichever is available.'
].join(' ')
},
marker: {
marker: extendDeep({}, colorAttributes('marker'), {
symbol: {
valType: 'enumerated',
values: Drawing.symbolList,
Expand Down Expand Up @@ -212,17 +216,6 @@ module.exports = {
role: 'style',
description: 'Sets the marker size (in px).'
},
color: {
valType: 'color',
arrayOk: true,
role: 'style',
description: [
'Sets the marker color. It accepts either a specific color',
'or an array of values that are mapped to the colorscale',
'relative to the max and min values of the array or relative to',
'`cmin` and `cmax` if set.'
].join(' ')
},
maxdisplayed: {
valType: 'number',
min: 0,
Expand Down Expand Up @@ -264,73 +257,6 @@ module.exports = {
'to pixels.'
].join(' ')
},
colorscale: {
valType: 'colorscale',
role: 'style',
description: [
'Sets the colorscale and only has an effect',
'if `marker.color` is set to a numerical array.',
'The colorscale must be an array containing',
'arrays mapping a normalized value to an',
'rgb, rgba, hex, hsl, hsv, or named color string.',
'At minimum, a mapping for the lowest (0) and highest (1)',
'values are required. For example,',
'`[[0, \'rgb(0,0,255)\', [1, \'rgb(255,0,0)\']]`.',
'To control the bounds of the colorscale in color space,',
'use `marker.cmin` and `marker.cmax`.'
].join(' ')
},
cauto: {
valType: 'boolean',
dflt: true,
role: 'style',
description: [
'Has an effect only if `marker.color` is set to a numerical array.',
'Determines the whether or not the color domain is computed',
'automatically.'
].join(' ')
},
cmax: {
valType: 'number',
dflt: null,
role: 'info',
description: [
'Has an effect only if `marker.color` is set to a numerical array.',
'Sets the upper bound of the color domain.',
'Value should be associated to the `marker.color` array index,',
'and if set, `marker.cmin` must be set as well.'
].join(' ')
},
cmin: {
valType: 'number',
dflt: null,
role: 'info',
description: [
'Has an effect only if `marker.color` is set to a numerical array.',
'Sets the lower bound of the color domain.',
'Value should be associated to the `marker.color` array index,',
'and if set, `marker.cmax` must be set as well.'
].join(' ')
},
autocolorscale: {
valType: 'boolean',
dflt: true,
role: 'style',
description: [
'Has an effect only if `marker.color` is set to a numerical array.',
'Determines whether or not the colorscale is picked using',
'values inside `marker.color`.'
].join(' ')
},
reversescale: {
valType: 'boolean',
role: 'style',
dflt: false,
description: [
'Has an effect only if `marker.color` is set to a numerical array.',
'Reverses the colorscale.'
].join(' ')
},
showscale: {
valType: 'boolean',
role: 'info',
Expand All @@ -340,94 +266,16 @@ module.exports = {
'Determines whether or not a colorbar is displayed.'
].join(' ')
},
line: {
color: {
valType: 'color',
arrayOk: true,
role: 'style',
description: [
'Sets the marker outline color. It accepts either a specific color',
'or an array of values that are mapped to the colorscale',
'relative to the max and min values of the array or relative to',
'`cmin` and `cmax` if set.'
].join(' ')
},
line: extendDeep({}, colorAttributes('marker.line'), {
width: {
valType: 'number',
min: 0,
arrayOk: true,
role: 'style',
description: 'Sets the width (in px) of the lines bounding the marker points.'
},
colorscale: {
valType: 'colorscale',
role: 'style',
description: [
'Sets the colorscale and only has an effect',
'if `marker.line.color` is set to a numerical array.',
'The colorscale must be an array containing',
'arrays mapping a normalized value to an',
'rgb, rgba, hex, hsl, hsv, or named color string.',
'At minimum, a mapping for the lowest (0) and highest (1)',
'values are required. For example,',
'`[[0, \'rgb(0,0,255)\', [1, \'rgb(255,0,0)\']]`.',
'To control the bounds of the colorscale in color space,',
'use `marker.line.cmin` and `marker.line.cmax`.'
].join(' ')
},
cauto: {
valType: 'boolean',
dflt: true,
role: 'style',
description: [
'Has an effect only if `marker.line.color` is set to a numerical array.',
'Determines the whether or not the color domain is computed',
'with respect to the input data.'
].join(' ')
},
cmax: {
valType: 'number',
dflt: null,
role: 'info',
description: [
'Has an effect only if `marker.line.color` is set to a numerical array.',
'Sets the upper bound of the color domain.',
'Value should be associated to the `marker.line.color` array index,',
'and if set, `marker.line.cmin` must be set as well.'
].join(' ')
},
cmin: {
valType: 'number',
dflt: null,
role: 'info',
description: [
'Has an effect only if `marker.line.color` is set to a numerical array.',
'Sets the lower bound of the color domain.',
'Value should be associated to the `marker.line.color` array index,',
'and if set, `marker.line.cmax` must be set as well.'
].join(' ')
},
autocolorscale: {
valType: 'boolean',
dflt: true,
role: 'style',
description: [
'Has an effect only if `marker.line.color` is set to a numerical array.',
'Determines whether or not the colorscale is picked using',
'the sign of values inside `marker.line.color`.'
].join(' ')
},
reversescale: {
valType: 'boolean',
dflt: false,
role: 'style',
description: [
'Has an effect only if `marker.line.color` is set to a numerical array.',
'Reverses the colorscale.'
].join(' ')
}
}
},
})
}),
textposition: {
valType: 'enumerated',
values: [
Expand Down
0