Skip to content

Commit 9d2568d

Browse files
committed
rm check for Plotly.ErrorBars (rm sub-bundles for now)
1 parent ad49e57 commit 9d2568d

File tree

5 files changed

+18
-31
lines changed

5 files changed

+18
-31
lines changed

src/plot_api/plot_api.js

+3-5
Original file line numberDiff line numberDiff line change
@@ -199,10 +199,8 @@ Plotly.plot = function(gd, data, layout, config) {
199199
Plotly.Lib.markTime('done with bar/box adjustments');
200200

201201
// calc and autorange for errorbars
202-
if(Plotly.ErrorBars) {
203-
Plotly.ErrorBars.calc(gd);
204-
Plotly.Lib.markTime('done Plotly.ErrorBars.calc');
205-
}
202+
Plotly.ErrorBars.calc(gd);
203+
Plotly.Lib.markTime('done Plotly.ErrorBars.calc');
206204

207205
// TODO: autosize extra for text markers
208206
return Plotly.Lib.syncOrAsync([
@@ -302,7 +300,7 @@ Plotly.plot = function(gd, data, layout, config) {
302300
}
303301

304302
// finally do all error bars at once
305-
if(gd._fullLayout._hasCartesian && Plotly.ErrorBars) {
303+
if(gd._fullLayout._hasCartesian) {
306304
Plotly.ErrorBars.plot(gd, subplotInfo, cdError);
307305
Plotly.Lib.markTime('done ErrorBars');
308306
}

src/traces/bars/bars.js

+3-5
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,8 @@ bars.supplyDefaults = function(traceIn, traceOut, defaultColor, layout) {
6161
coerce('text');
6262

6363
// override defaultColor for error bars with defaultLine
64-
if(Plotly.ErrorBars) {
65-
Plotly.ErrorBars.supplyDefaults(traceIn, traceOut, Plotly.Color.defaultLine, {axis: 'y'});
66-
Plotly.ErrorBars.supplyDefaults(traceIn, traceOut, Plotly.Color.defaultLine, {axis: 'x', inherit: 'y'});
67-
}
64+
Plotly.ErrorBars.supplyDefaults(traceIn, traceOut, Plotly.Color.defaultLine, {axis: 'y'});
65+
Plotly.ErrorBars.supplyDefaults(traceIn, traceOut, Plotly.Color.defaultLine, {axis: 'x', inherit: 'y'});
6866
};
6967

7068
bars.supplyLayoutDefaults = function(layoutIn, layoutOut, fullData) {
@@ -558,7 +556,7 @@ bars.hoverPoints = function(pointData, xval, yval, hovermode) {
558556

559557
if(di.tx) pointData.text = di.tx;
560558

561-
if(Plotly.ErrorBars) Plotly.ErrorBars.hoverInfo(di, trace, pointData);
559+
Plotly.ErrorBars.hoverInfo(di, trace, pointData);
562560

563561
return [pointData];
564562
};

src/traces/scatter/scatter.js

+7-12
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,8 @@ scatter.supplyDefaults = function(traceIn, traceOut, defaultColor, layout) {
9595
if(!scatter.hasLines(traceOut)) lineShapeDefaults(traceIn, traceOut, coerce);
9696
}
9797

98-
if(Plotly.ErrorBars) {
99-
Plotly.ErrorBars.supplyDefaults(traceIn, traceOut, defaultColor, {axis: 'y'});
100-
Plotly.ErrorBars.supplyDefaults(traceIn, traceOut, defaultColor, {axis: 'x', inherit: 'y'});
101-
}
98+
Plotly.ErrorBars.supplyDefaults(traceIn, traceOut, defaultColor, {axis: 'y'});
99+
Plotly.ErrorBars.supplyDefaults(traceIn, traceOut, defaultColor, {axis: 'x', inherit: 'y'});
102100
};
103101

104102
// common to 'scatter', 'scatter3d', 'scattergeo' and 'scattergl'
@@ -367,13 +365,10 @@ scatter.calc = function(gd, trace) {
367365
}
368366

369367
// if no error bars, markers or text, or fill to y=0 remove x padding
370-
else if(
371-
(Plotly.ErrorBars===undefined || !trace.error_y.visible) &&
372-
(
373-
['tonexty', 'tozeroy'].indexOf(trace.fill)!==-1 ||
374-
(!scatter.hasMarkers(trace) && !scatter.hasText(trace))
375-
)
376-
) {
368+
else if(!trace.error_y.visible && (
369+
['tonexty', 'tozeroy'].indexOf(trace.fill)!==-1 ||
370+
(!scatter.hasMarkers(trace) && !scatter.hasText(trace))
371+
)) {
377372
xOptions.padded = false;
378373
xOptions.ppad = 0;
379374
}
@@ -909,7 +904,7 @@ scatter.hoverPoints = function(pointData, xval, yval, hovermode) {
909904
if(di.tx) pointData.text = di.tx;
910905
else if(trace.text) pointData.text = trace.text;
911906

912-
if(Plotly.ErrorBars) Plotly.ErrorBars.hoverInfo(di, trace, pointData);
907+
Plotly.ErrorBars.hoverInfo(di, trace, pointData);
913908

914909
return [pointData];
915910
};

src/traces/scatter3d/defaults.js

+3-5
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,9 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
4545
}
4646
}
4747

48-
if(Plotly.ErrorBars) {
49-
Plotly.ErrorBars.supplyDefaults(traceIn, traceOut, defaultColor, {axis: 'z'});
50-
Plotly.ErrorBars.supplyDefaults(traceIn, traceOut, defaultColor, {axis: 'y', inherit: 'z'});
51-
Plotly.ErrorBars.supplyDefaults(traceIn, traceOut, defaultColor, {axis: 'x', inherit: 'z'});
52-
}
48+
Plotly.ErrorBars.supplyDefaults(traceIn, traceOut, defaultColor, {axis: 'z'});
49+
Plotly.ErrorBars.supplyDefaults(traceIn, traceOut, defaultColor, {axis: 'y', inherit: 'z'});
50+
Plotly.ErrorBars.supplyDefaults(traceIn, traceOut, defaultColor, {axis: 'x', inherit: 'z'});
5351
};
5452

5553
function handleXYZDefaults(traceIn, traceOut, coerce) {

src/traces/scattergl/defaults.js

+2-4
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ module.exports = function supplyDefaults(traceIn, traceOut, defaultColor, layout
3333
Scatter.fillColorDefaults(traceIn, traceOut, defaultColor, coerce);
3434
}
3535

36-
if(Plotly.ErrorBars) {
37-
Plotly.ErrorBars.supplyDefaults(traceIn, traceOut, defaultColor, {axis: 'y'});
38-
Plotly.ErrorBars.supplyDefaults(traceIn, traceOut, defaultColor, {axis: 'x', inherit: 'y'});
39-
}
36+
Plotly.ErrorBars.supplyDefaults(traceIn, traceOut, defaultColor, {axis: 'y'});
37+
Plotly.ErrorBars.supplyDefaults(traceIn, traceOut, defaultColor, {axis: 'x', inherit: 'y'});
4038
};

0 commit comments

Comments
 (0)