@@ -116,12 +116,10 @@ module.exports = function draw(gd) {
116
116
return trace . visible === 'legendonly' ? 0.5 : 1 ;
117
117
}
118
118
} )
119
- . each ( function ( d ) {
120
- var legendItem = d [ 0 ] ;
121
-
119
+ . each ( function ( ) {
122
120
d3 . select ( this )
123
- . call ( drawTexts , gd , legendItem )
124
- . call ( setupTraceToggle , gd , legendItem ) ;
121
+ . call ( drawTexts , gd )
122
+ . call ( setupTraceToggle , gd ) ;
125
123
} ) ;
126
124
127
125
if ( gd . firstRender ) {
@@ -315,8 +313,9 @@ module.exports = function draw(gd) {
315
313
}
316
314
} ;
317
315
318
- function drawTexts ( g , gd , legendItem ) {
319
- var fullLayout = gd . _fullLayout ,
316
+ function drawTexts ( g , gd ) {
317
+ var legendItem = g . data ( ) [ 0 ] [ 0 ] ,
318
+ fullLayout = gd . _fullLayout ,
320
319
trace = legendItem . trace ,
321
320
isPie = Plots . traceIs ( trace , 'pie' ) ,
322
321
traceIndex = trace . index ,
@@ -338,7 +337,7 @@ function drawTexts(g, gd, legendItem) {
338
337
function textLayout ( s ) {
339
338
Plotly . util . convertToTspans ( s , function ( ) {
340
339
s . selectAll ( 'tspan.line' ) . attr ( { x : s . attr ( 'x' ) } ) ;
341
- g . call ( computeTextDimensions , gd , legendItem ) ;
340
+ g . call ( computeTextDimensions , gd ) ;
342
341
} ) ;
343
342
}
344
343
@@ -356,7 +355,7 @@ function drawTexts(g, gd, legendItem) {
356
355
else text . call ( textLayout ) ;
357
356
}
358
357
359
- function setupTraceToggle ( g , gd , legendItem ) {
358
+ function setupTraceToggle ( g , gd ) {
360
359
var hiddenSlices = gd . _fullLayout . hiddenlabels ?
361
360
gd . _fullLayout . hiddenlabels . slice ( ) :
362
361
[ ] ;
@@ -373,7 +372,8 @@ function setupTraceToggle(g, gd, legendItem) {
373
372
traceToggle . on ( 'click' , function ( ) {
374
373
if ( gd . _dragged ) return ;
375
374
376
- var fullData = gd . _fullData ,
375
+ var legendItem = g . data ( ) [ 0 ] [ 0 ] ,
376
+ fullData = gd . _fullData ,
377
377
trace = legendItem . trace ,
378
378
legendgroup = trace . legendgroup ,
379
379
traceIndicesInGroup = [ ] ,
@@ -406,8 +406,9 @@ function setupTraceToggle(g, gd, legendItem) {
406
406
} ) ;
407
407
}
408
408
409
- function computeTextDimensions ( g , gd , legendItem ) {
410
- var bg = g . selectAll ( '.legendtoggle' ) ,
409
+ function computeTextDimensions ( g , gd ) {
410
+ var legendItem = g . data ( ) [ 0 ] [ 0 ] ,
411
+ bg = g . selectAll ( '.legendtoggle' ) ,
411
412
mathjaxGroup = g . select ( 'g[class*=math-group]' ) ,
412
413
opts = gd . _fullLayout . legend ,
413
414
lineHeight = opts . font . size * 1.3 ,
0 commit comments