From: Ben McCann <322311+benmccann@users.noreply.github.com>
Date: Tue, 19 Mar 2019 10:42:41 +0000 (-0700)
Subject: Improvements to helpers.almostWhole (#6120)
X-Git-Tag: v2.9.0~1^2~90
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4941aa0217ea1cd7029863d08b52fc59aa918af1;p=thirdparty%2FChart.js.git

Improvements to helpers.almostWhole (#6120)
---

diff --git a/src/core/core.helpers.js b/src/core/core.helpers.js
index 7922747de..52c8aea68 100644
--- a/src/core/core.helpers.js
+++ b/src/core/core.helpers.js
@@ -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) {
diff --git a/test/specs/core.helpers.tests.js b/test/specs/core.helpers.tests.js
index a075c0e8d..1f2bc29d5 100644
--- a/test/specs/core.helpers.tests.js
+++ b/test/specs/core.helpers.tests.js
@@ -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() {