Remove unused model properties (#6691)

* Remove unused model properties
* Add to migration guide

diff --git a/docs/getting-started/v3-migration.md b/docs/getting-started/v3-migration.md
index 41d1bfd2092e9fa1cacf1d17ff842f380af37c8d..74faeb5cd00c4a8aeb476ca4dc11e5115de0e388 100644 (file)
--- a/docs/getting-started/v3-migration.md
+++ b/docs/getting-started/v3-migration.md
@@ -66,6 +66,11 @@ Chart.js is no longer providing the `Chart.bundle.js` and `Chart.bundle.min.js`.
 * Made `scale.handleDirectionalChanges` private
 * Made `scale.tickValues` private
 
+#### Removal of private APIs
+
+* `_model.datasetLabel`
+* `_model.label`
+
 ### Renamed
 
 * `helpers.clear` was renamed to `helpers.canvas.clear`

diff --git a/src/controllers/controller.bar.js b/src/controllers/controller.bar.js
index 4bf0010eb7f47c3abc60c7007b6b804a75cdccba..12ca5a534741620d9848c80ef94fbaf8860e1281 100644 (file)
--- a/src/controllers/controller.bar.js
+++ b/src/controllers/controller.bar.js
@@ -238,7 +238,6 @@ module.exports = DatasetController.extend({
 
        updateElement: function(rectangle, index, reset) {
                var me = this;
-               var dataset = me.getDataset();
                var options = me._resolveDataElementOptions(index);
 
                rectangle._datasetIndex = me.index;
@@ -247,9 +246,7 @@ module.exports = DatasetController.extend({
                        backgroundColor: options.backgroundColor,
                        borderColor: options.borderColor,
                        borderSkipped: options.borderSkipped,
-                       borderWidth: options.borderWidth,
-                       datasetLabel: dataset.label,
-                       label: me.chart.data.labels[index]
+                       borderWidth: options.borderWidth
                };
 
                // all borders are drawn for floating bar

diff --git a/src/controllers/controller.doughnut.js b/src/controllers/controller.doughnut.js
index 099c88b91487c36f3d0d49b9d06aab1cda2f1182..8df290ad4026c56f35120865ba6754e18d2c527a 100644 (file)
--- a/src/controllers/controller.doughnut.js
+++ b/src/controllers/controller.doughnut.js
@@ -232,7 +232,6 @@ module.exports = DatasetController.extend({
                var centerY = (chartArea.top + chartArea.bottom) / 2;
                var startAngle = opts.rotation; // non reset case handled later
                var endAngle = opts.rotation; // non reset case handled later
-               var dataset = me.getDataset();
                var circumference = reset && animationOpts.animateRotate ? 0 : arc.hidden ? 0 : me.calculateCircumference(arc._val * opts.circumference / DOUBLE_PI);
                var innerRadius = reset && animationOpts.animateScale ? 0 : me.innerRadius;
                var outerRadius = reset && animationOpts.animateScale ? 0 : me.outerRadius;
@@ -255,8 +254,7 @@ module.exports = DatasetController.extend({
                                endAngle: endAngle,
                                circumference: circumference,
                                outerRadius: outerRadius,
-                               innerRadius: innerRadius,
-                               label: helpers.valueAtIndexOrDefault(dataset.label, index, chart.data.labels[index])
+                               innerRadius: innerRadius
                        }
                });
 

diff --git a/src/controllers/controller.polarArea.js b/src/controllers/controller.polarArea.js
index d2458bd7b2ddbde010a5b70586aaebc977971217..2e172ff80fccd28395ab91c4556da50367e377f0 100644 (file)
--- a/src/controllers/controller.polarArea.js
+++ b/src/controllers/controller.polarArea.js
@@ -187,7 +187,6 @@ module.exports = DatasetController.extend({
                var opts = chart.options;
                var animationOpts = opts.animation;
                var scale = chart.scale;
-               var labels = chart.data.labels;
 
                var centerX = scale.xCenter;
                var centerY = scale.yCenter;
@@ -217,8 +216,7 @@ module.exports = DatasetController.extend({
                                innerRadius: 0,
                                outerRadius: reset ? resetRadius : distance,
                                startAngle: reset && animationOpts.animateRotate ? datasetStartAngle : startAngle,
-                               endAngle: reset && animationOpts.animateRotate ? datasetStartAngle : endAngle,
-                               label: helpers.valueAtIndexOrDefault(labels, index, labels[index])
+                               endAngle: reset && animationOpts.animateRotate ? datasetStartAngle : endAngle
                        }
                });
 

diff --git a/test/specs/controller.bar.tests.js b/test/specs/controller.bar.tests.js
index 91e7cfa71b931b2c9bba86d6b46397754d6213b8..cb958d8373a5f5b4d47dba03753d282334300438 100644 (file)
--- a/test/specs/controller.bar.tests.js
+++ b/test/specs/controller.bar.tests.js
@@ -746,8 +746,6 @@ describe('Chart.controllers.bar', function() {
                        expect(meta.data[i]._model.base).toBeCloseToPixel(1024);
                        expect(meta.data[i]._model.width).toBeCloseToPixel(46);
                        expect(meta.data[i]._model).toEqual(jasmine.objectContaining({
-                               datasetLabel: chart.data.datasets[1].label,
-                               label: chart.data.labels[i],
                                backgroundColor: 'red',
                                borderSkipped: 'top',
                                borderColor: 'blue',

diff --git a/test/specs/controller.doughnut.tests.js b/test/specs/controller.doughnut.tests.js
index b2634dea47a752fba09b552aa1a47a29005bf2e3..328d5dab85efbacaf2385d938adc2fb7167d8c3c 100644 (file)
--- a/test/specs/controller.doughnut.tests.js
+++ b/test/specs/controller.doughnut.tests.js
@@ -114,7 +114,6 @@ describe('Chart.controllers.doughnut', function() {
                        expect(meta.data[i]._model).toEqual(jasmine.objectContaining({
                                startAngle: Math.PI * -0.5,
                                endAngle: Math.PI * -0.5,
-                               label: chart.data.labels[i],
                                backgroundColor: 'rgb(255, 0, 0)',
                                borderColor: 'rgb(0, 0, 255)',
                                borderWidth: 2
@@ -137,7 +136,6 @@ describe('Chart.controllers.doughnut', function() {
                        expect(meta.data[i]._model.startAngle).toBeCloseTo(expected.s, 8);
                        expect(meta.data[i]._model.endAngle).toBeCloseTo(expected.e, 8);
                        expect(meta.data[i]._model).toEqual(jasmine.objectContaining({
-                               label: chart.data.labels[i],
                                backgroundColor: 'rgb(255, 0, 0)',
                                borderColor: 'rgb(0, 0, 255)',
                                borderWidth: 2

diff --git a/test/specs/controller.polarArea.tests.js b/test/specs/controller.polarArea.tests.js
index d25d56cafa70c3b390e1ccc601000eb85d39b154..f4b4107568995652f920fe89d14ef548975f56b0 100644 (file)
--- a/test/specs/controller.polarArea.tests.js
+++ b/test/specs/controller.polarArea.tests.js
@@ -117,8 +117,7 @@ describe('Chart.controllers.polarArea', function() {
                        expect(meta.data[i]._model).toEqual(jasmine.objectContaining({
                                backgroundColor: 'rgb(255, 0, 0)',
                                borderColor: 'rgb(0, 255, 0)',
-                               borderWidth: 1.2,
-                               label: chart.data.labels[i]
+                               borderWidth: 1.2
                        }));
                });
 
@@ -186,8 +185,7 @@ describe('Chart.controllers.polarArea', function() {
                        expect(meta.data[i]._model).toEqual(jasmine.objectContaining({
                                backgroundColor: 'rgb(255, 0, 0)',
                                borderColor: 'rgb(0, 255, 0)',
-                               borderWidth: 1.2,
-                               label: chart.data.labels[i]
+                               borderWidth: 1.2
                        }));
                });
        });