require scatter subTypes directly,

  instead of require all of Scatter

Author: etpinard

src/components/drawing/index.js

@@ -13,6 +13,7 @@ var Plotly = require('../../plotly');
 var d3 = require('d3');
 var isNumeric = require('fast-isnumeric');
 
+var subTypes = require('../../traces/scatter/subtypes');
 var makeBubbleSizeFn = require('../../traces/scatter/make_bubble_size_func');
 
 var drawing = module.exports = {};
@@ -184,7 +185,7 @@ drawing.pointStyle = function(s, trace) {
 
             // handle multi-trace graph edit case
             if(d.ms==='various' || marker.size==='various') r = 3;
-            else r = Plotly.Scatter.isBubble(trace) ?
+            else r = subTypes.isBubble(trace) ?
                         sizeFn(d.ms) : (marker.size || 6) / 2;
 
             // store the calculated size so hover can use it

src/components/errorbars/index.js

@@ -9,10 +9,14 @@
 
 'use strict';
 
-var Plotly = require('../../plotly');
 var d3 = require('d3');
 var isNumeric = require('fast-isnumeric');
 
+var Lib = require('../../lib');
+var Color = require('../color');
+var subTypes = require('../../traces/scatter/subtypes');
+
+
 var errorBars = module.exports = {};
 
 errorBars.attributes = require('./attributes');
@@ -70,13 +74,13 @@ errorBars.plot = function(gd, plotinfo, cd) {
             var trace = d[0].trace,
                 xObj = trace.error_x,
                 yObj = trace.error_y,
-                sparse = Plotly.Scatter.hasMarkers(trace) &&
+                sparse = subTypes.hasMarkers(trace) &&
                     trace.marker.maxdisplayed>0;
 
             if(!yObj.visible && !xObj.visible) return;
 
             d3.select(this).selectAll('g')
-                .data(Plotly.Lib.identity)
+                .data(Lib.identity)
               .enter().append('g')
                 .each(function(d){
                     coords = errorcoords(d, xa, ya);
@@ -121,13 +125,13 @@ errorBars.style = function(gd){
 
         eb.selectAll('g path.yerror')
             .style('stroke-width', yObj.thickness+'px')
-            .call(Plotly.Color.stroke, yObj.color);
+            .call(Color.stroke, yObj.color);
 
         if(xObj.copy_ystyle) xObj = yObj;
 
         eb.selectAll('g path.xerror')
             .style('stroke-width', xObj.thickness+'px')
-            .call(Plotly.Color.stroke, xObj.color);
+            .call(Color.stroke, xObj.color);
     });
 };
 

src/components/legend/index.js

@@ -1,3 +1,4 @@
+
 /**
 * Copyright 2012-2016, Plotly, Inc.
 * All rights reserved.
@@ -12,6 +13,7 @@
 var Plotly = require('../../plotly');
 var d3 = require('d3');
 
+var subTypes = require('../../traces/scatter/subtypes');
 var styleOne = require('../../traces/pie/style_one');
 
 var legend = module.exports = {};
@@ -80,7 +82,7 @@ legend.supplyLayoutDefaults = function(layoutIn, layoutOut, fullData) {
 legend.lines = function(d){
     var trace = d[0].trace,
         showFill = trace.visible && trace.fill && trace.fill!=='none',
-        showLine = Plotly.Scatter.hasLines(trace);
+        showLine = subTypes.hasLines(trace);
 
     var fill = d3.select(this).select('.legendfill').selectAll('path')
         .data(showFill ? [d] : []);
@@ -100,9 +102,9 @@ legend.lines = function(d){
 legend.points = function(d){
     var d0 = d[0],
         trace = d0.trace,
-        showMarkers = Plotly.Scatter.hasMarkers(trace),
-        showText = Plotly.Scatter.hasText(trace),
-        showLines = Plotly.Scatter.hasLines(trace);
+        showMarkers = subTypes.hasMarkers(trace),
+        showText = subTypes.hasText(trace),
+        showLines = subTypes.hasLines(trace);
 
     var dMod, tMod;
 

src/traces/scattergeo/index.js

@@ -9,21 +9,14 @@
 
 'use strict';
 
-var Scatter = require('../scatter');
-
 var ScatterGeo = {};
 
 ScatterGeo.attributes = require('./attributes');
 ScatterGeo.supplyDefaults = require('./defaults');
-ScatterGeo.colorbar = Scatter.colorbar;
+ScatterGeo.colorbar = require('../scatter/colorbar');
+ScatterGeo.calc = require('./calc');
 ScatterGeo.plot = require('./plot').plot;
 
-ScatterGeo.calc = function(gd, trace) {
-
-    Scatter.calcMarkerColorscales(trace);
-
-};
-
 ScatterGeo.moduleType = 'trace';
 ScatterGeo.name = 'scattergeo';
 ScatterGeo.categories = ['geo', 'symbols', 'markerColorscale', 'showLegend'];

src/traces/scattergeo/plot.js

@@ -18,8 +18,7 @@ var arrayToCalcItem = require('../../lib/array_to_calc_item');
 
 var Color = require('../../components/color');
 var Drawing = require('../../components/drawing');
-
-var Scatter = require('../scatter');
+var subTypes = require('../scatter/subtypes');
 
 var attributes = require('./attributes');
 
@@ -132,7 +131,7 @@ plotScatterGeo.plot = function(geo, scattergeoData) {
     // TODO add hover - how?
     gScatterGeoTraces
         .each(function(trace) {
-            if(!Scatter.hasLines(trace) || trace.visible !== true) return;
+            if(!subTypes.hasLines(trace) || trace.visible !== true) return;
             d3.select(this)
                 .append('path')
                 .datum(makeLineGeoJSON(trace))
@@ -143,8 +142,8 @@ plotScatterGeo.plot = function(geo, scattergeoData) {
         .attr('class', 'points')
         .each(function(trace) {
             var s = d3.select(this),
-                showMarkers = Scatter.hasMarkers(trace),
-                showText = Scatter.hasText(trace);
+                showMarkers = subTypes.hasMarkers(trace),
+                showText = subTypes.hasText(trace);
 
             if((!showMarkers && !showText) || trace.visible !== true) {
                 s.remove();

src/traces/scattergl/convert.js

@@ -18,12 +18,10 @@ var createError = require('gl-error2d');
 var isNumeric = require('fast-isnumeric');
 
 var Lib = require('../../lib');
+var ErrorBars = require('../../components/errorbars');
 var str2RGBArray = require('../../lib/str2rgbarray');
 var formatColor = require('../../lib/gl_format_color');
-
-var Scatter = require('../scatter');
-
-var ErrorBars = require('../../components/errorbars');
+var subTypes = require('../scatter/subtypes');
 var makeBubbleSizeFn = require('../scatter/make_bubble_size_func');
 var getTraceColor = require('../scatter/get_trace_color');
 
@@ -241,10 +239,10 @@ proto.update = function(options) {
         this.hasMarkers = false;
     }
     else {
-        this.hasLines = Scatter.hasLines(options);
+        this.hasLines = subTypes.hasLines(options);
         this.hasErrorX = options.error_x.visible === true;
         this.hasErrorY = options.error_y.visible === true;
-        this.hasMarkers = Scatter.hasMarkers(options);
+        this.hasMarkers = subTypes.hasMarkers(options);
     }
 
     this.textLabels = options.text;

src/traces/scattergl/index.js

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