Skip to content

Commit df04d68

Browse files
committed
revise legend dflt
1 parent 72c1354 commit df04d68

File tree

4 files changed

+151
-149
lines changed

4 files changed

+151
-149
lines changed

src/components/legend/defaults.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ var basePlotLayoutAttributes = require('../../plots/layout_attributes');
1010
var helpers = require('./helpers');
1111

1212
function getLegendName(id) {
13-
return 'legend' + (id || '');
13+
return 'legend' + (id > 1 ? id : '');
1414
}
1515

1616
function groupDefaults(id, layoutIn, layoutOut, fullData) {
@@ -157,7 +157,7 @@ function groupDefaults(id, layoutIn, layoutOut, fullData) {
157157

158158
module.exports = function legendDefaults(layoutIn, layoutOut, fullData) {
159159
var i;
160-
var legends = [0];
160+
var legends = [1];
161161

162162
for(i = 0; i < fullData.length; i++) {
163163
Lib.pushUnique(legends, fullData[i].legend);
@@ -167,7 +167,7 @@ module.exports = function legendDefaults(layoutIn, layoutOut, fullData) {
167167
for(i = 0; i < legends.length; i++) {
168168
var id = legends[i];
169169
var name = getLegendName(id);
170-
if(id && !layoutIn[name]) continue;
170+
if(id > 1 && !layoutIn[name]) continue;
171171

172172
groupDefaults(id, layoutIn, layoutOut, fullData);
173173

src/components/legend/draw.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ module.exports = function draw(gd, opts) {
3030
} else {
3131
var legends = gd._fullLayout._legends;
3232
for(var i = 0; i < legends.length; i++) {
33-
var legendObj = gd._fullLayout['legend' + (legends[i] || '')];
33+
var id = legends[i];
34+
var legendObj = gd._fullLayout['legend' + (id > 1 ? id : '')];
3435
drawOne(gd, legendObj);
3536
}
3637
}
@@ -887,5 +888,6 @@ function getYanchor(legendObj) {
887888
}
888889

889890
function getId(legendObj) {
890-
return legendObj._id || '';
891+
var id = legendObj._id;
892+
return id > 1 ? id : '';
891893
}

src/plots/attributes.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ module.exports = {
3434
},
3535
legend: {
3636
valType: 'number',
37-
dflt: 0,
38-
min: 2,
37+
dflt: 1,
38+
min: 1,
3939
editType: 'style',
4040
description: [
4141
'Sets the legend id to show this trace in.',
42-
'If *0* (the default value), it refers to `layout.legend`.',
42+
'If *1* (the default value), it refers to `layout.legend`.',
4343
'If *2*, it refers to `layout.legend2`, and so on.'
4444
].join(' ')
4545
},

0 commit comments

Comments
 (0)