factor out isSelectable routine

Author: etpinard

src/components/modebar/manage.js

@@ -71,10 +71,15 @@ module.exports = function manageModeBar(gd) {
 // logic behind which buttons are displayed by default
 function getButtonGroups(gd, buttonsToRemove, buttonsToAdd) {
     var fullLayout = gd._fullLayout,
-        fullData = gd._fullData,
-        groups = [],
-        i,
-        trace;
+        fullData = gd._fullData;
+
+    var hasCartesian = fullLayout._hasCartesian,
+        hasGL3D = fullLayout._hasGL3D,
+        hasGeo = fullLayout._hasGeo,
+        hasPie = fullLayout._hasPie,
+        hasGL2D = fullLayout._hasGL2D;
+
+    var groups = [];
 
     function addGroup(newGroup) {
         var out = [];
@@ -88,52 +93,42 @@ function getButtonGroups(gd, buttonsToRemove, buttonsToAdd) {
         groups.push(out);
     }
 
+    function appendButtonsToAdd(groups) {
+        if(buttonsToAdd.length) {
+            if(Array.isArray(buttonsToAdd[0])) {
+                for(var i = 0; i < buttonsToAdd.length; i++) {
+                    groups.push(buttonsToAdd[i]);
+                }
+            }
+            else groups.push(buttonsToAdd);
+        }
+
+        return groups;
+    }
+
     // buttons common to all plot types
     addGroup(['toImage', 'sendDataToCloud']);
 
-    if(fullLayout._hasGL3D) {
+    if(hasGL3D) {
         addGroup(['zoom3d', 'pan3d', 'orbitRotation', 'tableRotation']);
         addGroup(['resetCameraDefault3d', 'resetCameraLastSave3d']);
         addGroup(['hoverClosest3d']);
     }
 
-    if(fullLayout._hasGeo) {
+    if(hasGeo) {
         addGroup(['zoomInGeo', 'zoomOutGeo', 'resetGeo']);
         addGroup(['hoverClosestGeo']);
     }
 
-    var hasCartesian = fullLayout._hasCartesian,
-        hasGL2D = fullLayout._hasGL2D,
-        allAxesFixed = areAllAxesFixed(fullLayout),
+    var allAxesFixed = areAllAxesFixed(fullLayout),
         dragModeGroup = [];
 
     if((hasCartesian || hasGL2D) && !allAxesFixed) {
         dragModeGroup = ['zoom2d', 'pan2d'];
     }
-    if(hasCartesian) {
-        // look for traces that support selection
-        // to be updated as we add more selectPoints handlers
-        var selectable = false;
-        for(i = 0; i < fullData.length; i++) {
-            if(selectable) break;
-            trace = fullData[i];
-            if(!trace._module || !trace._module.selectPoints) continue;
-
-            if(trace.type === 'scatter') {
-                if(scatterSubTypes.hasMarkers(trace) || scatterSubTypes.hasText(trace)) {
-                    selectable = true;
-                }
-            }
-            // assume that in general if the trace module has selectPoints,
-            // then it's selectable. Scatter is an exception to this because it must
-            // have markers or text, not just be a scatter type.
-            else selectable = true;
-        }
-
-        if(selectable) {
-            dragModeGroup.push('select2d');
-            dragModeGroup.push('lasso2d');
-        }
+    if(hasCartesian && isSelectable(fullData)) {
+        dragModeGroup.push('select2d');
+        dragModeGroup.push('lasso2d');
     }
     if(dragModeGroup.length) addGroup(dragModeGroup);
 
@@ -147,21 +142,11 @@ function getButtonGroups(gd, buttonsToRemove, buttonsToAdd) {
     if(hasGL2D) {
         addGroup(['hoverClosestGl2d']);
     }
-    if(fullLayout._hasPie) {
+    if(hasPie) {
         addGroup(['hoverClosestPie']);
     }
 
-    // append buttonsToAdd to the groups
-    if(buttonsToAdd.length) {
-        if(Array.isArray(buttonsToAdd[0])) {
-            for(i = 0; i < buttonsToAdd.length; i++) {
-                groups.push(buttonsToAdd[i]);
-            }
-        }
-        else groups.push(buttonsToAdd);
-    }
-
-    return groups;
+    return appendButtonsToAdd(groups);
 }
 
 function areAllAxesFixed(fullLayout) {
@@ -178,6 +163,32 @@ function areAllAxesFixed(fullLayout) {
     return allFixed;
 }
 
+// look for traces that support selection
+// to be updated as we add more selectPoints handlers
+function isSelectable(fullData) {
+    var selectable = false;
+
+    for(var i = 0; i < fullData.length; i++) {
+        if(selectable) break;
+
+        var trace = fullData[i];
+
+        if(!trace._module || !trace._module.selectPoints) continue;
+
+        if(trace.type === 'scatter') {
+            if(scatterSubTypes.hasMarkers(trace) || scatterSubTypes.hasText(trace)) {
+                selectable = true;
+            }
+        }
+        // assume that in general if the trace module has selectPoints,
+        // then it's selectable. Scatter is an exception to this because it must
+        // have markers or text, not just be a scatter type.
+        else selectable = true;
+    }
+
+    return selectable;
+}
+
 // fill in custom buttons referring to default mode bar buttons
 function fillCustomButton(customButtons) {
     for(var i = 0; i < customButtons.length; i++) {