move errorbar plot calls to Bar.plot and Scatter.plot

Author: etpinard

src/plots/cartesian/index.js

@@ -11,8 +11,6 @@
 
 var Lib = require('../../lib');
 var Plots = require('../plots');
-var ErrorBars = require('../../components/errorbars');
-
 
 exports.name = 'cartesian';
 
@@ -71,8 +69,7 @@ exports.plot = function(gd) {
     for(var i = 0; i < subplots.length; i++) {
         var subplot = subplots[i],
             subplotInfo = fullLayout._plots[subplot],
-            cdSubplot = getCdSubplot(calcdata, subplot),
-            cdError = [];
+            cdSubplot = getCdSubplot(calcdata, subplot);
 
         // remove old traces, then redraw everything
         // TODO: use enter/exit appropriately in the plot functions
@@ -91,17 +88,9 @@ exports.plot = function(gd) {
             // plot all traces of this type on this subplot at once
             var cdModule = getCdModule(cdSubplot, _module);
             _module.plot(gd, subplotInfo, cdModule);
-            Lib.markTime('done ' + (cdModule[0] && cdModule[0][0].trace.type));
 
-            // collect the traces that may have error bars
-            if(cdModule[0] && cdModule[0][0].trace && Plots.traceIs(cdModule[0][0].trace, 'errorBarsOK')) {
-                cdError = cdError.concat(cdModule);
-            }
+            Lib.markTime('done ' + (cdModule[0] && cdModule[0][0].trace.type));
         }
-
-        // finally do all error bars at once
-        ErrorBars.plot(gd, subplotInfo, cdError);
-        Lib.markTime('done ErrorBars');
     }
 
     // now draw stuff not on subplots (ie, only pies at the moment)

src/traces/bar/plot.js

@@ -14,6 +14,7 @@ var isNumeric = require('fast-isnumeric');
 
 var Lib = require('../../lib');
 var Color = require('../../components/color');
+var ErrorBars = require('../../components/errorbars');
 
 var arraysToCalcdata = require('./arrays_to_calcdata');
 
@@ -102,4 +103,8 @@ module.exports = function plot(gd, plotinfo, cdbar) {
                         'M'+x0+','+y0+'V'+y1+'H'+x1+'V'+y0+'Z');
                 });
         });
+
+    // error bars are on the top
+    bartraces.call(ErrorBars.plot, plotinfo);
+
 };

src/traces/scatter/plot.js

@@ -13,6 +13,7 @@ var d3 = require('d3');
 
 var Lib = require('../../lib');
 var Drawing = require('../../components/drawing');
+var ErrorBars = require('../../components/errorbars');
 
 var subTypes = require('./subtypes');
 var arraysToCalcdata = require('./arrays_to_calcdata');
@@ -30,10 +31,14 @@ module.exports = function plot(gd, plotinfo, cdscatter) {
     var scattertraces = plotinfo.plot.select('.scatterlayer')
         .selectAll('g.trace.scatter')
         .data(cdscatter);
+
     scattertraces.enter().append('g')
         .attr('class', 'trace scatter')
         .style('stroke-miterlimit', 2);
 
+    // error bars are at the bottom
+    scattertraces.call(ErrorBars.plot, plotinfo);
+
     // BUILD LINES AND FILLS
     var prevpath = '',
         tozero, tonext, nexttonext;