Move getId() to helpers.js

Author: alexshoe

src/components/legend/draw.js

@@ -83,7 +83,7 @@ function drawOne(gd, opts) {
     var legendObj = opts || {};
 
     var fullLayout = gd._fullLayout;
-    var legendId = getId(legendObj);
+    var legendId = helpers.getId(legendObj);
 
     var clipId, layer;
 
@@ -558,7 +558,7 @@ function clickOrDoubleClick(gd, legend, legendItem, numClicks, evt) {
 }
 
 function drawTexts(g, gd, legendObj) {
-    var legendId = getId(legendObj);
+    var legendId = helpers.getId(legendObj);
     var legendItem = g.data()[0][0];
     var trace = legendItem.trace;
     var isPieLike = Registry.traceIs(trace, 'pie-like');
@@ -772,7 +772,7 @@ function computeTextDimensions(g, gd, legendObj, aTitle) {
     var mathjaxGroup = g.select('g[class*=math-group]');
     var mathjaxNode = mathjaxGroup.node();
 
-    var legendId = getId(legendObj);
+    var legendId = helpers.getId(legendObj);
     if(!legendObj) {
         legendObj = gd._fullLayout[legendId];
     }
@@ -877,7 +877,7 @@ function getTitleSize(legendObj) {
  */
 function computeLegendDimensions(gd, groups, traces, legendObj) {
     var fullLayout = gd._fullLayout;
-    var legendId = getId(legendObj);
+    var legendId = helpers.getId(legendObj);
     if(!legendObj) {
         legendObj = fullLayout[legendId];
     }
@@ -1137,6 +1137,3 @@ function getYanchor(legendObj) {
         'top';
 }
 
-function getId(legendObj) {
-    return legendObj._id || 'legend';
-}

src/components/legend/handle_click.js

@@ -3,6 +3,7 @@
 var Registry = require('../../registry');
 var Lib = require('../../lib');
 var pushUnique = Lib.pushUnique;
+var helpers = require('./helpers');
 
 var SHOWISOLATETIP = true;
 
@@ -277,7 +278,7 @@ exports.handleClick = function handleClick(g, gd, numClicks) {
 exports.handleTitleClick = function handleTitleClick(gd, legendObj, mode) {
     const fullLayout = gd._fullLayout;
     const fullData = gd._fullData;
-    const legendId = legendObj._id || 'legend';
+    const legendId = helpers.getId(legendObj);
     const shapesWithLegend = (fullLayout.shapes || []).filter(function(d) { return d.showlegend; });
     const allLegendItems = fullData.concat(shapesWithLegend);
 

src/components/legend/helpers.js

@@ -11,3 +11,7 @@ exports.isVertical = function isVertical(legendLayout) {
 exports.isReversed = function isReversed(legendLayout) {
     return (legendLayout.traceorder || '').indexOf('reversed') !== -1;
 };
+
+exports.getId = function getId(legendObj) {
+    return legendObj._id || 'legend';
+};