Draw the rightmost grid line when offsetGridLines is true (#6326)

* Draw the rightmost grid line when offsetGridLines is true * Refactor based on feedback * Replace helpers.each with for loop * Minor refactoring * Refactor _computeItemsToDraw
chartjs · Jul 18, 2019 · 626d8cc · 626d8cc
1 parent 28fdffb
commit 626d8cc
Show file tree

Hide file tree

Showing 8 changed files with 205 additions and 150 deletions.
diff --git a/src/core/core.scale.js b/src/core/core.scale.js
diff --git a/src/scales/scale.radialLinear.js b/src/scales/scale.radialLinear.js
@@ -18,7 +18,7 @@ var defaultConfig = {
 
 	angleLines: {
 		display: true,
-		color: 'rgba(0, 0, 0, 0.1)',
+		color: 'rgba(0,0,0,0.1)',
 		lineWidth: 1,
 		borderDash: [],
 		borderDashOffset: 0.0

diff --git a/test/specs/core.scale.tests.js b/test/specs/core.scale.tests.js
@@ -89,12 +89,12 @@ describe('Core.scale', function() {
 		labels: ['tick1', 'tick2', 'tick3', 'tick4', 'tick5'],
 		offsetGridLines: true,
 		offset: false,
-		expected: [-63.5, 64.5, 192.5, 320.5, 448.5]
+		expected: [64.5, 192.5, 320.5, 448.5]
 	}, {
 		labels: ['tick1', 'tick2', 'tick3', 'tick4', 'tick5'],
 		offsetGridLines: true,
 		offset: true,
-		expected: [0.5, 102.5, 204.5, 307.5, 409.5]
+		expected: [0.5, 102.5, 204.5, 307.5, 409.5, 512.5]
 	}, {
 		labels: ['tick1'],
 		offsetGridLines: false,
@@ -109,16 +109,16 @@ describe('Core.scale', function() {
 		labels: ['tick1'],
 		offsetGridLines: true,
 		offset: false,
-		expected: [-511.5]
+		expected: [512.5]
 	}, {
 		labels: ['tick1'],
 		offsetGridLines: true,
 		offset: true,
-		expected: [0.5]
+		expected: [0.5, 512.5]
 	}];
 
 	gridLineTests.forEach(function(test) {
-		it('should get the correct pixels for ' + test.labels.length + ' gridLine(s) for the horizontal scale when offsetGridLines is ' + test.offsetGridLines + ' and offset is ' + test.offset, function() {
+		it('should get the correct pixels for gridLine(s) for the horizontal scale when offsetGridLines is ' + test.offsetGridLines + ' and offset is ' + test.offset, function() {
 			var chart = window.acquireChart({
 				type: 'line',
 				data: {
@@ -163,7 +163,7 @@ describe('Core.scale', function() {
 	});
 
 	gridLineTests.forEach(function(test) {
-		it('should get the correct pixels for ' + test.labels.length + ' gridLine(s) for the vertical scale when offsetGridLines is ' + test.offsetGridLines + ' and offset is ' + test.offset, function() {
+		it('should get the correct pixels for gridLine(s) for the vertical scale when offsetGridLines is ' + test.offsetGridLines + ' and offset is ' + test.offset, function() {
 			var chart = window.acquireChart({
 				type: 'line',
 				data: {

diff --git a/test/specs/scale.category.tests.js b/test/specs/scale.category.tests.js
@@ -13,7 +13,7 @@ describe('Category scale tests', function() {
 			display: true,
 
 			gridLines: {
-				color: 'rgba(0, 0, 0, 0.1)',
+				color: 'rgba(0,0,0,0.1)',
 				drawBorder: true,
 				drawOnChartArea: true,
 				drawTicks: true, // draw ticks extending towards the label

diff --git a/test/specs/scale.linear.tests.js b/test/specs/scale.linear.tests.js
@@ -11,7 +11,7 @@ describe('Linear Scale', function() {
 			display: true,
 
 			gridLines: {
-				color: 'rgba(0, 0, 0, 0.1)',
+				color: 'rgba(0,0,0,0.1)',
 				drawBorder: true,
 				drawOnChartArea: true,
 				drawTicks: true, // draw ticks extending towards the label

diff --git a/test/specs/scale.logarithmic.tests.js b/test/specs/scale.logarithmic.tests.js
@@ -10,7 +10,7 @@ describe('Logarithmic Scale tests', function() {
 		expect(defaultConfig).toEqual({
 			display: true,
 			gridLines: {
-				color: 'rgba(0, 0, 0, 0.1)',
+				color: 'rgba(0,0,0,0.1)',
 				drawBorder: true,
 				drawOnChartArea: true,
 				drawTicks: true,

diff --git a/test/specs/scale.radialLinear.tests.js b/test/specs/scale.radialLinear.tests.js
@@ -13,7 +13,7 @@ describe('Test the radial linear scale', function() {
 		expect(defaultConfig).toEqual({
 			angleLines: {
 				display: true,
-				color: 'rgba(0, 0, 0, 0.1)',
+				color: 'rgba(0,0,0,0.1)',
 				lineWidth: 1,
 				borderDash: [],
 				borderDashOffset: 0.0
@@ -22,7 +22,7 @@ describe('Test the radial linear scale', function() {
 			display: true,
 			gridLines: {
 				circular: false,
-				color: 'rgba(0, 0, 0, 0.1)',
+				color: 'rgba(0,0,0,0.1)',
 				drawBorder: true,
 				drawOnChartArea: true,
 				drawTicks: true,

diff --git a/test/specs/scale.time.tests.js b/test/specs/scale.time.tests.js
@@ -58,7 +58,7 @@ describe('Time scale tests', function() {
 		expect(defaultConfig).toEqual({
 			display: true,
 			gridLines: {
-				color: 'rgba(0, 0, 0, 0.1)',
+				color: 'rgba(0,0,0,0.1)',
 				drawBorder: true,
 				drawOnChartArea: true,
 				drawTicks: true,