fixup variable names for consistency

Author: etpinard

src/traces/scatter3d/calc.js

@@ -9,8 +9,7 @@
 'use strict';
 
 var arraysToCalcdata = require('../scatter/arrays_to_calcdata');
-var calcColorscales = require('../scatter/colorscale_calc');
-
+var calcColorscale = require('../scatter/colorscale_calc');
 
 /**
  * This is a kludge to put the array attributes into
@@ -21,7 +20,7 @@ module.exports = function calc(gd, trace) {
     var cd = [{x: false, y: false, trace: trace, t: {}}];
 
     arraysToCalcdata(cd, trace);
-    calcColorscales(gd, trace);
+    calcColorscale(gd, trace);
 
     return cd;
 };

src/traces/scattergl/index.js

@@ -27,7 +27,7 @@ var scatterCalc = require('../scatter/calc');
 var calcMarkerSize = scatterCalc.calcMarkerSize;
 var calcAxisExpansion = scatterCalc.calcAxisExpansion;
 var setFirstScatter = scatterCalc.setFirstScatter;
-var calcColorscales = require('../scatter/colorscale_calc');
+var calcColorscale = require('../scatter/colorscale_calc');
 var linkTraces = require('../scatter/link_traces');
 var getTraceColor = require('../scatter/get_trace_color');
 var fillHoverText = require('../scatter/fill_hover_text');
@@ -84,7 +84,7 @@ function calc(gd, trace) {
     }
 
     // create scene options and scene
-    calcColorscales(gd, trace);
+    calcColorscale(gd, trace);
     var opts = sceneOptions(gd, subplot, trace, positions, x, y);
     var scene = sceneUpdate(gd, subplot);
 

src/traces/scatterpolargl/index.js

@@ -12,7 +12,7 @@ var cluster = require('point-cluster');
 var isNumeric = require('fast-isnumeric');
 
 var ScatterGl = require('../scattergl');
-var calcColorscales = require('../scatter/colorscale_calc');
+var calcColorscale = require('../scatter/colorscale_calc');
 var calcMarkerSize = require('../scatter/calc').calcMarkerSize;
 var convert = require('../scattergl/convert');
 
@@ -38,7 +38,7 @@ function calc(gd, trace) {
     stash.r = rArray;
     stash.theta = thetaArray;
 
-    calcColorscales(gd, trace);
+    calcColorscale(gd, trace);
 
     // only compute 'style' options in calc, as position options
     // depend on the radial range and must be set in plot

src/traces/splom/index.js

@@ -19,7 +19,7 @@ var AxisIDs = require('../../plots/cartesian/axis_ids');
 var subTypes = require('../scatter/subtypes');
 var calcMarkerSize = require('../scatter/calc').calcMarkerSize;
 var calcAxisExpansion = require('../scatter/calc').calcAxisExpansion;
-var calcColorscales = require('../scatter/colorscale_calc');
+var calcColorscale = require('../scatter/colorscale_calc');
 var convertMarkerSelection = require('../scattergl/convert').markerSelection;
 var convertMarkerStyle = require('../scattergl/convert').markerStyle;
 var calcHover = require('../scattergl').calcHover;
@@ -80,7 +80,7 @@ function calc(gd, trace) {
         }
     }
 
-    calcColorscales(gd, trace);
+    calcColorscale(gd, trace);
     Lib.extendFlat(opts, convertMarkerStyle(trace));
 
     var visibleLength = cdata.length;
@@ -310,7 +310,7 @@ function editStyle(gd, cd0) {
     var scene = gd._fullLayout._splomScenes[trace.uid];
 
     if(scene) {
-        calcColorscales(gd, trace);
+        calcColorscale(gd, trace);
 
         Lib.extendFlat(scene.matrixOptions, convertMarkerStyle(trace));
         // TODO [un]selected styles?