Skip to content

Commit 53600e0

Browse files
committed
Add helpers._deprecated
1 parent 6588a19 commit 53600e0

File tree

3 files changed

+17
-24
lines changed

3 files changed

+17
-24
lines changed

src/controllers/controller.bar.js

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ var defaults = require('../core/core.defaults');
55
var elements = require('../elements/index');
66
var helpers = require('../helpers/index');
77

8+
var deprecated = helpers._deprecated;
89
var valueOrDefault = helpers.valueOrDefault;
910

1011
defaults._set('bar', {
@@ -123,14 +124,6 @@ function computeFlexCategoryTraits(index, ruler, options) {
123124
};
124125
}
125126

126-
function deprecated(value, previous, current) {
127-
if (value !== undefined) {
128-
console.warn(
129-
'bar chart: "' + previous + '" is deprecated. ' +
130-
'Please use "' + current + '" instead');
131-
}
132-
}
133-
134127
module.exports = DatasetController.extend({
135128

136129
dataElementType: elements.Rectangle,
@@ -156,11 +149,11 @@ module.exports = DatasetController.extend({
156149
meta.bar = true;
157150

158151
scaleOpts = me._getIndexScale().options;
159-
deprecated(scaleOpts.barPercentage, 'scales.[x/y]Axes.barPercentage', 'dataset.barPercentage');
160-
deprecated(scaleOpts.barThickness, 'scales.[x/y]Axes.barThickness', 'dataset.barThickness');
161-
deprecated(scaleOpts.categoryPercentage, 'scales.[x/y]Axes.categoryPercentage', 'dataset.categoryPercentage');
162-
deprecated(me._getValueScale().options.minBarLength, 'scales.[x/y]Axes.minBarLength', 'dataset.minBarLength');
163-
deprecated(scaleOpts.maxBarThickness, 'scales.[x/y]Axes.maxBarThickness', 'dataset.maxBarThickness');
152+
deprecated('bar chart', scaleOpts.barPercentage, 'scales.[x/y]Axes.barPercentage', 'dataset.barPercentage');
153+
deprecated('bar chart', scaleOpts.barThickness, 'scales.[x/y]Axes.barThickness', 'dataset.barThickness');
154+
deprecated('bar chart', scaleOpts.categoryPercentage, 'scales.[x/y]Axes.categoryPercentage', 'dataset.categoryPercentage');
155+
deprecated('bar chart', me._getValueScale().options.minBarLength, 'scales.[x/y]Axes.minBarLength', 'dataset.minBarLength');
156+
deprecated('bar chart', scaleOpts.maxBarThickness, 'scales.[x/y]Axes.maxBarThickness', 'dataset.maxBarThickness');
164157
},
165158

166159
update: function(reset) {

src/helpers/helpers.core.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,13 @@ var helpers = {
306306

307307
ChartElement.__super__ = me.prototype;
308308
return ChartElement;
309+
},
310+
311+
_deprecated: function(scope, value, previous, current) {
312+
if (value !== undefined) {
313+
console.warn(scope + ': "' + previous +
314+
'" is deprecated. Please use "' + current + '" instead');
315+
}
309316
}
310317
};
311318

src/scales/scale.time.js

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ var defaults = require('../core/core.defaults');
55
var helpers = require('../helpers/index');
66
var Scale = require('../core/core.scale');
77

8+
var deprecated = helpers._deprecated;
89
var valueOrDefault = helpers.valueOrDefault;
910

1011
// Integer constants are from the ES6 spec.
@@ -60,14 +61,6 @@ var INTERVALS = {
6061

6162
var UNITS = Object.keys(INTERVALS);
6263

63-
function deprecated(value, previous, current) {
64-
if (value !== undefined) {
65-
console.warn(
66-
'time scale: "' + previous + '" is deprecated. ' +
67-
'Please use "' + current + '" instead');
68-
}
69-
}
70-
7164
function sorter(a, b) {
7265
return a - b;
7366
}
@@ -488,9 +481,9 @@ module.exports = Scale.extend({
488481
var adapter = me._adapter = new adapters._date(options.adapters.date);
489482

490483
// DEPRECATIONS: output a message only one time per update
491-
deprecated(time.format, 'time.format', 'time.parser');
492-
deprecated(time.min, 'time.min', 'ticks.min');
493-
deprecated(time.max, 'time.max', 'ticks.max');
484+
deprecated('time scale', time.format, 'time.format', 'time.parser');
485+
deprecated('time scale', time.min, 'time.min', 'ticks.min');
486+
deprecated('time scale', time.max, 'time.max', 'ticks.max');
494487

495488
// Backward compatibility: before introducing adapter, `displayFormats` was
496489
// supposed to contain *all* unit/string pairs but this can't be resolved

0 commit comments

Comments
 (0)