From: Tom Pullen <tpullen21@gmail.com>
Date: Wed, 8 Aug 2018 16:52:56 +0000 (+0100)
Subject: Fix adding and removing datasets in bar samples (#5663)
X-Git-Tag: v2.7.3~1^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ab41173d9b2abb9c543c82c360abb51c3efcd778;p=thirdparty%2FChart.js.git

Fix adding and removing datasets in bar samples (#5663)

Account for zero indexing of arrays when creating a name for an added dataset and remove the last dataset in the array when removing a dataset rather than removing the first.
---

diff --git a/samples/charts/bar/horizontal.html b/samples/charts/bar/horizontal.html
index 6450e014d..e174ad2ca 100644
--- a/samples/charts/bar/horizontal.html
+++ b/samples/charts/bar/horizontal.html
@@ -102,7 +102,7 @@
 			var colorName = colorNames[horizontalBarChartData.datasets.length % colorNames.length];
 			var dsColor = window.chartColors[colorName];
 			var newDataset = {
-				label: 'Dataset ' + horizontalBarChartData.datasets.length,
+				label: 'Dataset ' + (horizontalBarChartData.datasets.length + 1),
 				backgroundColor: color(dsColor).alpha(0.5).rgbString(),
 				borderColor: dsColor,
 				data: []
@@ -130,7 +130,7 @@
 		});
 
 		document.getElementById('removeDataset').addEventListener('click', function() {
-			horizontalBarChartData.datasets.splice(0, 1);
+			horizontalBarChartData.datasets.pop();
 			window.myHorizontalBar.update();
 		});
 
diff --git a/samples/charts/bar/vertical.html b/samples/charts/bar/vertical.html
index e9348b274..5127d4937 100644
--- a/samples/charts/bar/vertical.html
+++ b/samples/charts/bar/vertical.html
@@ -95,7 +95,7 @@
 			var colorName = colorNames[barChartData.datasets.length % colorNames.length];
 			var dsColor = window.chartColors[colorName];
 			var newDataset = {
-				label: 'Dataset ' + barChartData.datasets.length,
+				label: 'Dataset ' + (barChartData.datasets.length + 1),
 				backgroundColor: color(dsColor).alpha(0.5).rgbString(),
 				borderColor: dsColor,
 				borderWidth: 1,
@@ -125,7 +125,7 @@
 		});
 
 		document.getElementById('removeDataset').addEventListener('click', function() {
-			barChartData.datasets.splice(0, 1);
+			barChartData.datasets.pop();
 			window.myBar.update();
 		});