]> git.ipfire.org Git - thirdparty/Chart.js.git/commitdiff
Fix adding and removing datasets in bar samples (#5663)
authorTom Pullen <tpullen21@gmail.com>
Wed, 8 Aug 2018 16:52:56 +0000 (17:52 +0100)
committerSimon Brunel <simonbrunel@users.noreply.github.com>
Wed, 8 Aug 2018 16:52:56 +0000 (18:52 +0200)
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.

samples/charts/bar/horizontal.html
samples/charts/bar/vertical.html

index 6450e014d92064c69c57b1fbb28265d43732fc31..e174ad2ca35cd142955a362a3fd3f17081804a4c 100644 (file)
                        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: []
                });
 
                document.getElementById('removeDataset').addEventListener('click', function() {
-                       horizontalBarChartData.datasets.splice(0, 1);
+                       horizontalBarChartData.datasets.pop();
                        window.myHorizontalBar.update();
                });
 
index e9348b274fdb9de71265bd23f220f61d76484651..5127d4937c2fc0cf2d05f6a9fafc5a5c92524529 100644 (file)
@@ -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,
                });
 
                document.getElementById('removeDataset').addEventListener('click', function() {
-                       barChartData.datasets.splice(0, 1);
+                       barChartData.datasets.pop();
                        window.myBar.update();
                });