diff --git a/package-lock.json b/package-lock.json index 8638af21656..17046688fbe 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "chart.js", - "version": "2.8.0", + "version": "2.9.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/src/controllers/controller.bar.js b/src/controllers/controller.bar.js index 398cdd9cdae..eadbc41bfbd 100644 --- a/src/controllers/controller.bar.js +++ b/src/controllers/controller.bar.js @@ -5,7 +5,6 @@ var defaults = require('../core/core.defaults'); var elements = require('../elements/index'); var helpers = require('../helpers/index'); -var deprecated = helpers._deprecated; var valueOrDefault = helpers.valueOrDefault; defaults._set('bar', { @@ -147,20 +146,13 @@ module.exports = DatasetController.extend({ initialize: function() { var me = this; - var meta, scaleOpts; + var meta; DatasetController.prototype.initialize.apply(me, arguments); meta = me.getMeta(); meta.stack = me.getDataset().stack; meta.bar = true; - - scaleOpts = me._getIndexScale().options; - deprecated('bar chart', scaleOpts.barPercentage, 'scales.[x/y]Axes.barPercentage', 'dataset.barPercentage'); - deprecated('bar chart', scaleOpts.barThickness, 'scales.[x/y]Axes.barThickness', 'dataset.barThickness'); - deprecated('bar chart', scaleOpts.categoryPercentage, 'scales.[x/y]Axes.categoryPercentage', 'dataset.categoryPercentage'); - deprecated('bar chart', me._getValueScale().options.minBarLength, 'scales.[x/y]Axes.minBarLength', 'dataset.minBarLength'); - deprecated('bar chart', scaleOpts.maxBarThickness, 'scales.[x/y]Axes.maxBarThickness', 'dataset.maxBarThickness'); }, update: function(reset) { @@ -405,24 +397,6 @@ module.exports = DatasetController.extend({ } helpers.canvas.unclipArea(chart.ctx); - }, - - /** - * @private - */ - _resolveDataElementOptions: function() { - var me = this; - var values = helpers.extend({}, DatasetController.prototype._resolveDataElementOptions.apply(me, arguments)); - var indexOpts = me._getIndexScale().options; - var valueOpts = me._getValueScale().options; - - values.barPercentage = valueOrDefault(indexOpts.barPercentage, values.barPercentage); - values.barThickness = valueOrDefault(indexOpts.barThickness, values.barThickness); - values.categoryPercentage = valueOrDefault(indexOpts.categoryPercentage, values.categoryPercentage); - values.maxBarThickness = valueOrDefault(indexOpts.maxBarThickness, values.maxBarThickness); - values.minBarLength = valueOrDefault(valueOpts.minBarLength, values.minBarLength); - - return values; } }); diff --git a/test/specs/controller.bar.tests.js b/test/specs/controller.bar.tests.js index 8d864af2190..91e7cfa71b9 100644 --- a/test/specs/controller.bar.tests.js +++ b/test/specs/controller.bar.tests.js @@ -1699,21 +1699,6 @@ describe('Chart.controllers.bar', function() { expect(meta.data[1]._model.width).toBeCloseToPixel(10); } }); - - it('should correctly set bar width if maxBarThickness is specified via deprecated option', function() { - var chart = this.chart; - var options = chart.options.scales.xAxes[0]; - var i, ilen, meta; - - options.maxBarThickness = 10; - chart.update(); - - for (i = 0, ilen = chart.data.datasets.length; i < ilen; ++i) { - meta = chart.getDatasetMeta(i); - expect(meta.data[0]._model.width).toBeCloseToPixel(10); - expect(meta.data[1]._model.width).toBeCloseToPixel(10); - } - }); }); }); }); @@ -1754,52 +1739,4 @@ describe('Chart.controllers.bar', function() { expect(data[1]._model.base - minBarLength).toEqual(data[1]._model.x); }); - it('deprecated minBarLength settings should be used on Y axis on bar chart', function() { - var minBarLength = 4; - var chart = window.acquireChart({ - type: 'bar', - data: { - datasets: [{ - data: [0.05, -0.05, 10, 15, 20, 25, 30, 35] - }] - }, - options: { - scales: { - yAxes: [{ - minBarLength: minBarLength - }] - } - } - }); - - var data = chart.getDatasetMeta(0).data; - - expect(data[0]._model.base - minBarLength).toEqual(data[0]._model.y); - expect(data[1]._model.base + minBarLength).toEqual(data[1]._model.y); - }); - - it('deprecated minBarLength settings should be used on X axis on horizontalBar chart', function() { - var minBarLength = 4; - var chart = window.acquireChart({ - type: 'horizontalBar', - data: { - datasets: [{ - data: [0.05, -0.05, 10, 15, 20, 25, 30, 35] - }] - }, - options: { - scales: { - xAxes: [{ - minBarLength: minBarLength - }] - } - } - }); - - var data = chart.getDatasetMeta(0).data; - - expect(data[0]._model.base + minBarLength).toEqual(data[0]._model.x); - expect(data[1]._model.base - minBarLength).toEqual(data[1]._model.x); - }); - });