move clearAxisTypes into helpers

alexcjohnson · alexcjohnson · commit 4f8fc6645e98 · 2017-09-19T10:54:50.000-04:00
diff --git a/src/plot_api/helpers.js b/src/plot_api/helpers.js
@@ -536,3 +536,36 @@ exports.hasParent = function(aobj, attr) {
     }
     return false;
 };
+
+/**
+ * Empty out types for all axes containing these traces so we auto-set them again
+ *
+ * @param {object} gd
+ * @param {[integer]} traces: trace indices to search for axes to clear the types of
+ * @param {object} layoutUpdate: any update being done concurrently to the layout,
+ *   which may supercede clearing the axis types
+ */
+var axLetters = ['x', 'y', 'z'];
+exports.clearAxisTypes = function(gd, traces, layoutUpdate) {
+    for(var i = 0; i < traces.length; i++) {
+        var trace = gd._fullData[i];
+        for(var j = 0; j < 3; j++) {
+            var ax = Axes.getFromTrace(gd, trace, axLetters[j]);
+
+            // do not clear log type - that's never an auto result so must have been intentional
+            if(ax && ax.type !== 'log') {
+                var axAttr = ax._name;
+                var sceneName = ax._id.substr(1);
+                if(sceneName.substr(0, 5) === 'scene') {
+                    if(layoutUpdate[sceneName] !== undefined) continue;
+                    axAttr = sceneName + '.' + axAttr;
+                }
+                var typeAttr = axAttr + '.type';
+
+                if(layoutUpdate[axAttr] === undefined && layoutUpdate[typeAttr] === undefined) {
+                    Lib.nestedProperty(gd.layout, typeAttr).set(null);
+                }
+            }
+        }
+    }
+};
diff --git a/src/plot_api/plot_api.js b/src/plot_api/plot_api.js
@@ -1286,7 +1286,7 @@ Plotly.restyle = function restyle(gd, astr, val, _traces) {
 
     // clear calcdata and/or axis types if required so they get regenerated
     if(flags.clearCalc) gd.calcdata = undefined;
-    if(flags.clearAxisTypes) clearAxisTypes(gd, traces, {});
+    if(flags.clearAxisTypes) helpers.clearAxisTypes(gd, traces, {});
 
     // fill in redraw sequence
     var seq = [];
@@ -2095,7 +2095,7 @@ Plotly.update = function update(gd, traceUpdate, layoutUpdate, _traces) {
 
     // clear calcdata and/or axis types if required
     if(restyleFlags.clearCalc || relayoutFlags.calc) gd.calcdata = undefined;
-    if(restyleFlags.clearAxisTypes) clearAxisTypes(gd, traces, layoutUpdate);
+    if(restyleFlags.clearAxisTypes) helpers.clearAxisTypes(gd, traces, layoutUpdate);
 
     // fill in redraw sequence
     var seq = [];
@@ -2150,33 +2150,6 @@ Plotly.update = function update(gd, traceUpdate, layoutUpdate, _traces) {
     });
 };
 
-// empty out types for all axes containing these traces
-// so we auto-set them again
-var axLetters = ['x', 'y', 'z'];
-function clearAxisTypes(gd, traces, layoutUpdate) {
-    for(var i = 0; i < traces.length; i++) {
-        var trace = gd._fullData[i];
-        for(var j = 0; j < 3; j++) {
-            var ax = Plotly.Axes.getFromTrace(gd, trace, axLetters[j]);
-
-            // do not clear log type - that's never an auto result so must have been intentional
-            if(ax && ax.type !== 'log') {
-                var axAttr = ax._name;
-                var sceneName = ax._id.substr(1);
-                if(sceneName.substr(0, 5) === 'scene') {
-                    if(layoutUpdate[sceneName] !== undefined) continue;
-                    axAttr = sceneName + '.' + axAttr;
-                }
-                var typeAttr = axAttr + '.type';
-
-                if(layoutUpdate[axAttr] === undefined && layoutUpdate[typeAttr] === undefined) {
-                    Lib.nestedProperty(gd.layout, typeAttr).set(null);
-                }
-            }
-        }
-    }
-}
-
 /**
  * Animate to a frame, sequence of frame, frame group, or frame definition
  *
