Skip to content

Commit 2e23fd5

Browse files
committed
Minor fixes based on feedback
1 parent 8ebdd96 commit 2e23fd5

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

src/controllers/controller.line.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ module.exports = DatasetController.extend({
7373
var line = meta.dataset;
7474
var points = meta.data || [];
7575
var options = me.chart.options;
76-
var datasetOpts = me._config;
77-
var showLine = me._showLine = valueOrDefault(datasetOpts.showLine, options.showLines);
76+
var config = me._config;
77+
var showLine = me._showLine = valueOrDefault(config.showLine, options.showLines);
7878
var i, ilen;
7979

8080
me._xScale = me.getScaleForId(meta.xAxisID);
@@ -83,8 +83,8 @@ module.exports = DatasetController.extend({
8383
// Update Line
8484
if (showLine) {
8585
// Compatibility: If the properties are defined with only the old name, use those values
86-
if ((datasetOpts.tension !== undefined) && (datasetOpts.lineTension === undefined)) {
87-
datasetOpts.lineTension = datasetOpts.tension;
86+
if (config.tension !== undefined && config.lineTension === undefined) {
87+
config.lineTension = config.tension;
8888
}
8989

9090
// Utility
@@ -161,7 +161,7 @@ module.exports = DatasetController.extend({
161161
*/
162162
_resolveDatasetElementOptions: function(element) {
163163
var me = this;
164-
var datasetOpts = me._config;
164+
var config = me._config;
165165
var custom = element.custom || {};
166166
var options = me.chart.options;
167167
var lineOptions = options.elements.line;
@@ -170,9 +170,9 @@ module.exports = DatasetController.extend({
170170
// The default behavior of lines is to break at null values, according
171171
// to https://github.com/chartjs/Chart.js/issues/2435#issuecomment-216718158
172172
// This option gives lines the ability to span gaps
173-
values.spanGaps = valueOrDefault(datasetOpts.spanGaps, options.spanGaps);
174-
values.tension = valueOrDefault(datasetOpts.lineTension, lineOptions.tension);
175-
values.steppedLine = resolve([custom.steppedLine, datasetOpts.steppedLine, lineOptions.stepped]);
173+
values.spanGaps = valueOrDefault(config.spanGaps, options.spanGaps);
174+
values.tension = valueOrDefault(config.lineTension, lineOptions.tension);
175+
values.steppedLine = resolve([custom.steppedLine, config.steppedLine, lineOptions.stepped]);
176176

177177
return values;
178178
},

src/controllers/controller.radar.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,12 @@ module.exports = DatasetController.extend({
6969
var line = meta.dataset;
7070
var points = meta.data || [];
7171
var scale = me.chart.scale;
72-
var datasetOpts = me._config;
72+
var config = me._config;
7373
var i, ilen;
7474

7575
// Compatibility: If the properties are defined with only the old name, use those values
76-
if ((datasetOpts.tension !== undefined) && (datasetOpts.lineTension === undefined)) {
77-
datasetOpts.lineTension = datasetOpts.tension;
76+
if (config.tension !== undefined && config.lineTension === undefined) {
77+
config.lineTension = config.tension;
7878
}
7979

8080
// Utility

0 commit comments

Comments
 (0)