Skip to content
This repository was archived by the owner on Nov 25, 2021. It is now read-only.

Commit 2278f02

Browse files
committed
Merge branch 'sgratzl/bugfix' into sgratzl/outliertooltip
2 parents 8c4f7a7 + ba8a609 commit 2278f02

File tree

4 files changed

+20
-0
lines changed

4 files changed

+20
-0
lines changed

src/controllers/boxplot.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,13 @@ const defaults = {
4040
Chart.defaults.boxplot = Chart.helpers.merge({}, [Chart.defaults.bar, verticalDefaults, defaults]);
4141
Chart.defaults.horizontalBoxplot = Chart.helpers.merge({}, [Chart.defaults.horizontalBar, horizontalDefaults, defaults]);
4242

43+
if (Chart.defaults.global.datasets && Chart.defaults.global.datasets.bar) {
44+
Chart.defaults.global.datasets.boxplot = {...Chart.defaults.global.datasets.bar};
45+
}
46+
if (Chart.defaults.global.datasets && Chart.defaults.global.datasets.horizontalBar) {
47+
Chart.defaults.global.datasets.horizontalBoxplot = {...Chart.defaults.global.datasets.horizontalBar};
48+
}
49+
4350
const boxplot = {
4451
...base,
4552
dataElementType: Chart.elements.BoxAndWhiskers,

src/controllers/violin.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,13 @@ const defaults = {
3131
Chart.defaults.violin = Chart.helpers.merge({}, [Chart.defaults.bar, verticalDefaults, defaults]);
3232
Chart.defaults.horizontalViolin = Chart.helpers.merge({}, [Chart.defaults.horizontalBar, horizontalDefaults, defaults]);
3333

34+
if (Chart.defaults.global.datasets && Chart.defaults.global.datasets.bar) {
35+
Chart.defaults.global.datasets.violin = {...Chart.defaults.global.datasets.bar};
36+
}
37+
if (Chart.defaults.global.datasets && Chart.defaults.global.datasets.horizontalBar) {
38+
Chart.defaults.global.datasets.horizontalViolin = {...Chart.defaults.global.datasets.horizontalBar};
39+
}
40+
3441
const controller = {
3542
...base,
3643
dataElementType: Chart.elements.Violin,

src/scale/arrayLinear.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ const ArrayLinearScale = Chart.scaleService.getScaleConstructor('linear').extend
1111
getRightValue(rawValue) {
1212
return Chart.LinearScaleBase.prototype.getRightValue.call(this, getRightValue(rawValue, this.options.ticks));
1313
},
14+
_parseValue(rawValue) {
15+
return Chart.LinearScaleBase.prototype._parseValue.call(this, getRightValue(rawValue, this.options.ticks));
16+
},
1417
determineDataLimits() {
1518
commonDataLimits.call(this);
1619
// Common base implementation to handle ticks.min, ticks.max, ticks.beginAtZero

src/scale/arrayLogarithmic.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ const ArrayLogarithmicScale = Chart.scaleService.getScaleConstructor('logarithmi
1212
getRightValue(rawValue) {
1313
return Chart.LinearScaleBase.prototype.getRightValue.call(this, getRightValue(rawValue, this.options.ticks));
1414
},
15+
_parseValue(rawValue) {
16+
return Chart.LinearScaleBase.prototype._parseValue.call(this, getRightValue(rawValue, this.options.ticks));
17+
},
1518
determineDataLimits() {
1619
// Add whitespace around bars. Axis shouldn't go exactly from min to max
1720
const tickOpts = this.options.ticks;

0 commit comments

Comments
 (0)