Skip to content

Commit b56bf0c

Browse files
committed
schema: make _isLinkedToArray define name of array container items
- instead of simply removing the trailing 's' of the container name
1 parent 7a22ca4 commit b56bf0c

File tree

10 files changed

+16
-15
lines changed

10 files changed

+16
-15
lines changed

src/components/annotations/attributes.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ var extendFlat = require('../../lib/extend').extendFlat;
1515

1616

1717
module.exports = {
18-
_isLinkedToArray: true,
18+
_isLinkedToArray: 'annotation',
1919

2020
visible: {
2121
valType: 'boolean',

src/components/images/attributes.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ var cartesianConstants = require('../../plots/cartesian/constants');
1212

1313

1414
module.exports = {
15-
_isLinkedToArray: true,
15+
_isLinkedToArray: 'image',
1616

1717
visible: {
1818
valType: 'boolean',

src/components/rangeselector/attributes.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ var extendFlat = require('../../lib/extend').extendFlat;
1414
var buttonAttrs = require('./button_attributes');
1515

1616
buttonAttrs = extendFlat(buttonAttrs, {
17-
_isLinkedToArray: true,
17+
_isLinkedToArray: 'button',
18+
1819
description: [
1920
'Sets the specifications for each buttons.',
2021
'By default, a range selector comes with no buttons.'

src/components/shapes/attributes.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ var extendFlat = require('../../lib/extend').extendFlat;
1515
var scatterLineAttrs = scatterAttrs.line;
1616

1717
module.exports = {
18-
_isLinkedToArray: true,
18+
_isLinkedToArray: 'shape',
1919

2020
visible: {
2121
valType: 'boolean',

src/components/sliders/attributes.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ var animationAttrs = require('../../plots/animation_attributes');
1616
var constants = require('./constants');
1717

1818
var stepsAttrs = {
19-
_isLinkedToArray: true,
19+
_isLinkedToArray: 'step',
2020

2121
method: {
2222
valType: 'enumerated',
@@ -57,6 +57,8 @@ var stepsAttrs = {
5757
};
5858

5959
module.exports = {
60+
_isLinkedToArray: 'slider',
61+
6062
visible: {
6163
valType: 'boolean',
6264
role: 'info',

src/components/sliders/constants.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@
1212

1313
module.exports = {
1414

15-
// layout attribute names
15+
// layout attribute name
1616
name: 'sliders',
17-
itemName: 'slider',
1817

1918
// class names
2019
containerClassName: 'slider-container',

src/components/updatemenus/attributes.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ var extendFlat = require('../../lib/extend').extendFlat;
1414
var padAttrs = require('../../plots/pad_attributes');
1515

1616
var buttonsAttrs = {
17-
_isLinkedToArray: true,
17+
_isLinkedToArray: 'button',
1818

1919
method: {
2020
valType: 'enumerated',
@@ -48,7 +48,7 @@ var buttonsAttrs = {
4848
};
4949

5050
module.exports = {
51-
_isLinkedToArray: true,
51+
_isLinkedToArray: 'updatemenu',
5252

5353
visible: {
5454
valType: 'boolean',

src/components/updatemenus/constants.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@
1212

1313
module.exports = {
1414

15-
// layout attribute names
15+
// layout attribute name
1616
name: 'updatemenus',
17-
itemName: 'updatemenu',
1817

1918
// class names
2019
containerClassName: 'updatemenu-container',

src/plot_api/validate.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -173,16 +173,16 @@ function crawl(objIn, objOut, schema, list, base, path) {
173173
crawl(valIn, valOut, nestedSchema, list, base, p);
174174
}
175175
else if(nestedSchema.items && !isInfoArray && isArray(valIn)) {
176-
var itemName = k.substr(0, k.length - 1),
176+
var items = nestedSchema.items,
177+
_nestedSchema = items[Object.keys(items)[0]],
177178
indexList = [];
178179

179180
var j, _p;
180181

181182
// loop over valOut items while keeping track of their
182183
// corresponding input container index (given by _index)
183184
for(j = 0; j < valOut.length; j++) {
184-
var _nestedSchema = nestedSchema.items[itemName],
185-
_index = valOut[j]._index || j;
185+
var _index = valOut[j]._index || j;
186186

187187
_p = p.slice();
188188
_p.push(_index);

src/plots/mapbox/layout_attributes.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ module.exports = {
105105
},
106106

107107
layers: {
108-
_isLinkedToArray: true,
108+
_isLinkedToArray: 'layer',
109109

110110
sourcetype: {
111111
valType: 'enumerated',

0 commit comments

Comments
 (0)