put scatter3d calc in separate, use it in scattergl

Author: etpinard

src/traces/scatter3d/calc.js

@@ -0,0 +1,27 @@
+/**
+* Copyright 2012-2016, Plotly, Inc.
+* All rights reserved.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*/
+
+'use strict';
+
+var arraysToCalcdata = require('../scatter/arrays_to_calcdata');
+var calcMarkerColorscale = require('../scatter/marker_colorscale_calc');
+
+
+/**
+ * This is a kludge to put the array attributes into
+ * calcdata the way Scatter.plot does, so that legends and
+ * popovers know what to do with them.
+ */
+module.exports = function calc(gd, trace) {
+    var cd = [{x: false, y: false, trace: trace, t: {}}];
+
+    arraysToCalcdata(cd);
+    calcMarkerColorscale(trace);
+
+    return cd;
+};

src/traces/scatter3d/index.js

@@ -8,27 +8,14 @@
 
 'use strict';
 
-var Scatter = require('../scatter');
-
 var Scatter3D = {};
 
 Scatter3D.plot = require('./convert');
 Scatter3D.attributes = require('./attributes');
 Scatter3D.markerSymbols = require('../../constants/gl_markers.json');
 Scatter3D.supplyDefaults = require('./defaults');
 Scatter3D.colorbar = require('../scatter/colorbar');
-
-Scatter3D.calc = function(gd, trace) {
-    // this is a kludge to put the array attributes into
-    // calcdata the way Scatter.plot does, so that legends and
-    // popovers know what to do with them.
-    var cd = [{x: false, y: false, trace: trace, t: {}}];
-    Scatter.arraysToCalcdata(cd);
-
-    Scatter.calcMarkerColorscales(trace);
-
-    return cd;
-};
+Scatter3D.calc = require('./calc');
 
 Scatter3D.moduleType = 'trace';
 Scatter3D.name = 'scatter3d';

src/traces/scattergl/index.js

@@ -8,16 +8,14 @@
 
 'use strict';
 
-var Scatter3D = require('../scatter3d');
-
 var ScatterGl = {};
 
 ScatterGl.attributes = require('./attributes');
 ScatterGl.supplyDefaults = require('./defaults');
 ScatterGl.colorbar = require('../scatter/colorbar');
 
 // reuse the Scatter3D 'dummy' calc step so that legends know what to do
-ScatterGl.calc = Scatter3D.calc;
+ScatterGl.calc = require('../scatter3d/calc');
 ScatterGl.plot = require('./convert');
 
 ScatterGl.moduleType = 'trace';