Skip to content

Commit 6bec6d1

Browse files
committed
Convert var to const where applicable
1 parent 459e229 commit 6bec6d1

5 files changed

Lines changed: 41 additions & 251 deletions

File tree

src/components/legend/defaults.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ function groupDefaults(legendId, layoutIn, layoutOut, fullData, legendCount) {
239239

240240
Lib.coerceFont(coerce, 'title.font', dfltTitleFont);
241241

242-
var hasMultipleLegends = legendCount > 1;
242+
const hasMultipleLegends = legendCount > 1;
243243
coerce('titleclick', hasMultipleLegends ? 'toggle' : false);
244244
coerce('titledoubleclick', hasMultipleLegends ? 'toggleothers' : false);
245245
}

src/components/legend/draw.js

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -205,14 +205,14 @@ function drawOne(gd, opts) {
205205
traces.exit().remove();
206206

207207
traces.style('opacity', function(d) {
208-
var legendItem = d[0];
209-
var trace = legendItem.trace;
208+
const legendItem = d[0];
209+
const trace = legendItem.trace;
210210

211211
// Toggle opacity of legend group titles if all items in the group are hidden
212212
if(legendItem.groupTitle) {
213-
var groupName = trace.legendgroup;
214-
var shapes = (fullLayout.shapes || []).filter(function(s) { return s.showlegend; });
215-
var anyVisible = gd._fullData.concat(shapes).some(function(item) {
213+
const groupName = trace.legendgroup;
214+
const shapes = (fullLayout.shapes || []).filter(function(s) { return s.showlegend; });
215+
const anyVisible = gd._fullData.concat(shapes).some(function(item) {
216216
return item.legendgroup === groupName &&
217217
(item.legend || 'legend') === legendId &&
218218
item.visible === true;
@@ -255,9 +255,9 @@ function drawOne(gd, opts) {
255255
}
256256

257257
// Toggle opacity of legend titles if all items in the legend are hidden
258-
var shapes = (fullLayout.shapes || []).filter(function(s) { return s.showlegend; });
259-
var anyVisible = gd._fullData.concat(shapes).some(function(item) {
260-
var inThisLegend = (item.legend || 'legend') === legendId;
258+
const shapes = (fullLayout.shapes || []).filter(function(s) { return s.showlegend; });
259+
const anyVisible = gd._fullData.concat(shapes).some(function(item) {
260+
const inThisLegend = (item.legend || 'legend') === legendId;
261261
return inThisLegend && item.visible === true;
262262
});
263263

@@ -667,18 +667,18 @@ function setupTraceToggle(g, gd, legendId) {
667667

668668
function setupTitleToggle(scrollBox, gd, legendObj, legendId) {
669669
// For now, skip title click for legends containing pie-like traces
670-
var hasPie = gd._fullData.some(function(trace) {
671-
var legend = trace.legend || 'legend';
672-
var inThisLegend = Array.isArray(legend) ? legend.includes(legendId) : legend === legendId;
670+
const hasPie = gd._fullData.some(function(trace) {
671+
const legend = trace.legend || 'legend';
672+
const inThisLegend = Array.isArray(legend) ? legend.includes(legendId) : legend === legendId;
673673
return inThisLegend && Registry.traceIs(trace, 'pie-like');
674674
});
675675
if(hasPie) return;
676676

677-
var doubleClickDelay = gd._context.doubleClickDelay;
677+
const doubleClickDelay = gd._context.doubleClickDelay;
678678
var newMouseDownTime;
679679
var numClicks = 1;
680680

681-
var titleToggle = Lib.ensureSingle(scrollBox, 'rect', legendId + 'titletoggle', function(s) {
681+
const titleToggle = Lib.ensureSingle(scrollBox, 'rect', legendId + 'titletoggle', function(s) {
682682
if(!gd._context.staticPlot) {
683683
s.style('cursor', 'pointer').attr('pointer-events', 'all');
684684
}
@@ -705,7 +705,7 @@ function setupTitleToggle(scrollBox, gd, legendObj, legendId) {
705705
numClicks = Math.max(numClicks - 1, 1);
706706
}
707707

708-
var evtData = {
708+
const evtData = {
709709
event: d3.event,
710710
legendId: legendId,
711711
data: gd.data,
@@ -715,7 +715,7 @@ function setupTitleToggle(scrollBox, gd, legendObj, legendId) {
715715
};
716716

717717
if(numClicks === 1 && legendObj.titleclick) {
718-
var clickVal = Events.triggerHandler(gd, 'plotly_legendtitleclick', evtData);
718+
const clickVal = Events.triggerHandler(gd, 'plotly_legendtitleclick', evtData);
719719
if(clickVal === false) return;
720720

721721
legendObj._titleClickTimeout = setTimeout(function() {
@@ -725,21 +725,21 @@ function setupTitleToggle(scrollBox, gd, legendObj, legendId) {
725725
if(legendObj._titleClickTimeout) clearTimeout(legendObj._titleClickTimeout);
726726
gd._legendMouseDownTime = 0;
727727

728-
var dblClickVal = Events.triggerHandler(gd, 'plotly_legendtitledoubleclick', evtData);
728+
const dblClickVal = Events.triggerHandler(gd, 'plotly_legendtitledoubleclick', evtData);
729729
if(dblClickVal !== false && legendObj.titledoubleclick) handleTitleClick(gd, legendObj, legendObj.titledoubleclick);
730730
}
731731
});
732732
}
733733

734734
function positionTitleToggle(scrollBox, legendObj, legendId) {
735-
var titleToggle = scrollBox.select('.' + legendId + 'titletoggle');
735+
const titleToggle = scrollBox.select('.' + legendId + 'titletoggle');
736736
if(!titleToggle.size()) return;
737737

738-
var side = legendObj.title.side || 'top';
739-
var bw = legendObj.borderwidth;
738+
const side = legendObj.title.side || 'top';
739+
const bw = legendObj.borderwidth;
740740
var x = bw;
741-
var width = legendObj._titleWidth + 2 * constants.titlePad;
742-
var height = legendObj._titleHeight + 2 * constants.titlePad;
741+
const width = legendObj._titleWidth + 2 * constants.titlePad;
742+
const height = legendObj._titleHeight + 2 * constants.titlePad;
743743

744744

745745
if(side === 'top center') {

src/components/legend/handle_click.js

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ exports.handleClick = function handleClick(g, gd, numClicks) {
1212
if(gd._dragged || gd._editing) return;
1313

1414

15-
var legendItem = g.data()[0][0];
15+
const legendItem = g.data()[0][0];
1616
if(legendItem.groupTitle && legendItem.noClick) return;
1717

18-
var legendId = legendItem.trace.legend || 'legend';
19-
var legendObj = fullLayout[legendId];
18+
const legendId = legendItem.trace.legend || 'legend';
19+
const legendObj = fullLayout[legendId];
2020

21-
var itemClick = legendObj.itemclick;
22-
var itemDoubleClick = legendObj.itemdoubleclick;
23-
var groupClick = legendObj.groupclick;
21+
const itemClick = legendObj.itemclick;
22+
const itemDoubleClick = legendObj.itemdoubleclick;
23+
const groupClick = legendObj.groupclick;
2424

2525
if(numClicks === 1 && itemClick === 'toggle' && itemDoubleClick === 'toggleothers' &&
2626
SHOWISOLATETIP && gd.data && gd._context.showTips
@@ -275,11 +275,11 @@ exports.handleClick = function handleClick(g, gd, numClicks) {
275275
};
276276

277277
exports.handleTitleClick = function handleTitleClick(gd, legendObj, mode) {
278-
var fullLayout = gd._fullLayout;
279-
var fullData = gd._fullData;
280-
var legendId = legendObj._id || 'legend';
281-
var shapesWithLegend = (fullLayout.shapes || []).filter(function(d) { return d.showlegend; });
282-
var allLegendItems = fullData.concat(shapesWithLegend);
278+
const fullLayout = gd._fullLayout;
279+
const fullData = gd._fullData;
280+
const legendId = legendObj._id || 'legend';
281+
const shapesWithLegend = (fullLayout.shapes || []).filter(function(d) { return d.showlegend; });
282+
const allLegendItems = fullData.concat(shapesWithLegend);
283283

284284
function isInLegend(item) {
285285
return (item.legend || 'legend') === legendId;
@@ -290,31 +290,31 @@ exports.handleTitleClick = function handleTitleClick(gd, legendObj, mode) {
290290

291291
if(mode === 'toggle') {
292292
// If any item is visible in this legend, hide all. If all are hidden, show all
293-
var anyVisibleHere = allLegendItems.some(function(item) {
293+
const anyVisibleHere = allLegendItems.some(function(item) {
294294
return isInLegend(item) && item.visible === true;
295295
});
296296

297297
toggleThisLegend = !anyVisibleHere;
298298
toggleOtherLegends = null;
299299
} else {
300300
// isolate this legend or set all legends to visible
301-
var anyVisibleElsewhere = allLegendItems.some(function(item) {
301+
const anyVisibleElsewhere = allLegendItems.some(function(item) {
302302
return !isInLegend(item) && item.visible === true && item.showlegend !== false;
303303
});
304304

305305
toggleThisLegend = true;
306306
toggleOtherLegends = !anyVisibleElsewhere;
307307
}
308308

309-
var dataUpdate = { visible: [] };
310-
var dataIndices = [];
311-
var updatedShapes = (fullLayout.shapes || []).map(function(d) { return d._input; });
309+
const dataUpdate = { visible: [] };
310+
const dataIndices = [];
311+
const updatedShapes = (fullLayout.shapes || []).map(function(d) { return d._input; });
312312
var shapesUpdated = false;
313313

314314
for(var i = 0; i < allLegendItems.length; i++) {
315-
var item = allLegendItems[i];
316-
var shouldShow = isInLegend(item) ? toggleThisLegend : toggleOtherLegends;
317-
var newVis = shouldShow ? true : 'legendonly';
315+
const item = allLegendItems[i];
316+
const shouldShow = isInLegend(item) ? toggleThisLegend : toggleOtherLegends;
317+
const newVis = shouldShow ? true : 'legendonly';
318318

319319
// Only update if the item is visible and the visibility is different from the new visibility
320320
if ((item.visible !== false) && (shouldShow !== null) && (item.visible !== newVis)) {
-101 KB
Binary file not shown.

0 commit comments

Comments
 (0)