Mirrors/Chart.js
2
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2026-03-06 16:26:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improvements to helpers.almostWhole (#6120)

Browse Source
This commit is contained in:
Ben McCann
2019-03-19 03:42:41 -07:00
committed by Simon Brunel
parent 390a8d7b41
commit 4941aa0217
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/core.helpers.js
View File

@@ -71,7 +71,7 @@ module.exports = function() {
};
helpers.almostWhole = function(x, epsilon) {
var rounded = Math.round(x);
return (((rounded - epsilon) < x) && ((rounded + epsilon) > x));
return ((rounded - epsilon) <= x) && ((rounded + epsilon) >= x);
};
helpers.max = function(array) {
return array.reduce(function(max, value) {

4
test/specs/core.helpers.tests.js
View File

@@ -46,6 +46,8 @@ describe('Core helper tests', function() {
it('should correctly determine if a numbers are essentially whole', function() {
expect(helpers.almostWhole(0.99999, 0.0001)).toBe(true);
expect(helpers.almostWhole(0.9, 0.0001)).toBe(false);
expect(helpers.almostWhole(1234567890123, 0.0001)).toBe(true);
expect(helpers.almostWhole(1234567890123.001, 0.0001)).toBe(false);
});
it('should generate integer ids', function() {
@@ -81,6 +83,8 @@ describe('Core helper tests', function() {
expect(helpers._decimalPlaces('1')).toBe(undefined);
expect(helpers._decimalPlaces('')).toBe(undefined);
expect(helpers._decimalPlaces(undefined)).toBe(undefined);
expect(helpers._decimalPlaces(12345678.1234)).toBe(4);
expect(helpers._decimalPlaces(1234567890.1234567)).toBe(7);
});
it('should get an angle from a point', function() {