Skip to content

Commit

Permalink
Partial fix for #3861, bubble series not working with logarithmic axe…
Browse files Browse the repository at this point in the history
…s. It now displays, but the bubbles are clipped unless the user sets a padding.
  • Loading branch information
TorsteinHonsi committed Jul 2, 2015
1 parent efd7496 commit 51c0339
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
3 changes: 2 additions & 1 deletion js/highcharts-more.src.js
Expand Up @@ -2131,7 +2131,8 @@ Axis.prototype.beforePadding = function () {
}
});

if (activeSeries.length && range > 0 && pick(this.options.min, this.userMin) === UNDEFINED && pick(this.options.max, this.userMax) === UNDEFINED) {
if (activeSeries.length && range > 0 && pick(this.options.min, this.userMin) === UNDEFINED &&
pick(this.options.max, this.userMax) === UNDEFINED && !this.isLog) {
pxMax -= axisLength;
transA *= (axisLength + pxMin - pxMax) / axisLength;
this.min += pxMin / transA;
Expand Down
3 changes: 2 additions & 1 deletion js/highmaps.src.js
Expand Up @@ -18227,7 +18227,8 @@ Axis.prototype.beforePadding = function () {
}
});

if (activeSeries.length && range > 0 && pick(this.options.min, this.userMin) === UNDEFINED && pick(this.options.max, this.userMax) === UNDEFINED) {
if (activeSeries.length && range > 0 && pick(this.options.min, this.userMin) === UNDEFINED &&
pick(this.options.max, this.userMax) === UNDEFINED && !this.isLog) {
pxMax -= axisLength;
transA *= (axisLength + pxMin - pxMax) / axisLength;
this.min += pxMin / transA;
Expand Down
3 changes: 2 additions & 1 deletion js/parts-more/BubbleSeries.js
Expand Up @@ -300,7 +300,8 @@ Axis.prototype.beforePadding = function () {
}
});

if (activeSeries.length && range > 0 && pick(this.options.min, this.userMin) === UNDEFINED && pick(this.options.max, this.userMax) === UNDEFINED) {
if (activeSeries.length && range > 0 && pick(this.options.min, this.userMin) === UNDEFINED &&
pick(this.options.max, this.userMax) === UNDEFINED && !this.isLog) {
pxMax -= axisLength;
transA *= (axisLength + pxMin - pxMax) / axisLength;
this.min += pxMin / transA;
Expand Down

0 comments on commit 51c0339

Please sign in to comment.