Skip to content

Commit

Permalink
Minor fixes based on feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
nagix committed May 22, 2019
1 parent 8ebdd96 commit 2e23fd5
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
16 changes: 8 additions & 8 deletions src/controllers/controller.line.js
Expand Up @@ -73,8 +73,8 @@ module.exports = DatasetController.extend({
var line = meta.dataset;
var points = meta.data || [];
var options = me.chart.options;
var datasetOpts = me._config;
var showLine = me._showLine = valueOrDefault(datasetOpts.showLine, options.showLines);
var config = me._config;
var showLine = me._showLine = valueOrDefault(config.showLine, options.showLines);
var i, ilen;

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

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

return values;
},
Expand Down
6 changes: 3 additions & 3 deletions src/controllers/controller.radar.js
Expand Up @@ -69,12 +69,12 @@ module.exports = DatasetController.extend({
var line = meta.dataset;
var points = meta.data || [];
var scale = me.chart.scale;
var datasetOpts = me._config;
var config = me._config;
var i, ilen;

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

// Utility
Expand Down

0 comments on commit 2e23fd5

Please sign in to comment.