Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ignore invalid log scale min and max #6058

Merged
merged 7 commits into from
Feb 24, 2019
Merged

Ignore invalid log scale min and max #6058

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9e8cf8e
Ignore invalid log scale min and max
benmccann Feb 9, 2019
d948325
Check for additional invalid values
benmccann Feb 12, 2019
034e222
Fix lint error
benmccann Feb 12, 2019
46bd3aa
Add a TODO for v3
benmccann Feb 13, 2019
46aa706
Use helpers.isFinite
benmccann Feb 13, 2019
4fc7704
nonNegativeOrDefault
benmccann Feb 14, 2019
8f15c80
fix comment
benmccann Feb 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions src/scales/scale.logarithmic.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,11 @@ var defaultConfig = {
}
};

// TODO(v3): change this to isPositive
function isNonNegative(value) {
benmccann marked this conversation as resolved.
Show resolved Hide resolved
return helpers.isFinite(value) && value >= 0;
}

module.exports = Scale.extend({
determineDataLimits: function() {
var me = this;
Expand Down Expand Up @@ -174,8 +179,8 @@ module.exports = Scale.extend({
var DEFAULT_MIN = 1;
var DEFAULT_MAX = 10;

me.min = valueOrDefault(tickOpts.min, me.min);
me.max = valueOrDefault(tickOpts.max, me.max);
me.min = isNonNegative(tickOpts.min) ? tickOpts.min : me.min;
benmccann marked this conversation as resolved.
Show resolved Hide resolved
me.max = isNonNegative(tickOpts.max) ? tickOpts.max : me.max;

if (me.min === me.max) {
if (me.min !== 0 && me.min !== null) {
Expand Down Expand Up @@ -211,8 +216,8 @@ module.exports = Scale.extend({
var reverse = !me.isHorizontal();

var generationOptions = {
min: tickOpts.min,
max: tickOpts.max
min: isNonNegative(tickOpts.min) ? tickOpts.min : undefined,
benmccann marked this conversation as resolved.
Show resolved Hide resolved
max: isNonNegative(tickOpts.max) ? tickOpts.max : undefined
};
var ticks = me.ticks = generateTicks(generationOptions, me);

Expand Down
62 changes: 62 additions & 0 deletions test/specs/scale.logarithmic.tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,6 +477,68 @@ describe('Logarithmic Scale tests', function() {
expect(yScale.ticks[tickCount - 1]).toBe(10);
});

it('should ignore negative min and max options', function() {
var chart = window.acquireChart({
type: 'bar',
data: {
datasets: [{
data: [1, 1, 1, 2, 1, 0]
}],
labels: []
},
options: {
scales: {
yAxes: [{
id: 'yScale',
type: 'logarithmic',
ticks: {
min: -10,
max: -1010,
callback: function(value) {
return value;
}
}
}]
}
}
});

var yScale = chart.scales.yScale;
expect(yScale.min).toBe(0);
expect(yScale.max).toBe(2);
});

it('should ignore invalid min and max options', function() {
var chart = window.acquireChart({
type: 'bar',
data: {
datasets: [{
data: [1, 1, 1, 2, 1, 0]
}],
labels: []
},
options: {
scales: {
yAxes: [{
id: 'yScale',
type: 'logarithmic',
ticks: {
min: '',
max: false,
callback: function(value) {
return value;
}
}
}]
}
}
});

var yScale = chart.scales.yScale;
expect(yScale.min).toBe(0);
expect(yScale.max).toBe(2);
});

it('should generate tick marks', function() {
var chart = window.acquireChart({
type: 'bar',
Expand Down