From: Ben McCann <322311+benmccann@users.noreply.github.com> Date: Tue, 5 Nov 2019 23:10:44 +0000 (-0800) Subject: Remove unused model properties (#6691) X-Git-Tag: v3.0.0-alpha~264 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e42413f3e81703aae14272198a5b4ec54136bc15;p=thirdparty%2FChart.js.git 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 41d1bfd20..74faeb5cd 100644 --- 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 4bf0010eb..12ca5a534 100644 --- 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 099c88b91..8df290ad4 100644 --- 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 d2458bd7b..2e172ff80 100644 --- 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 91e7cfa71..cb958d837 100644 --- 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 b2634dea4..328d5dab8 100644 --- 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 d25d56caf..f4b410756 100644 --- 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 })); }); });