]> git.ipfire.org Git - thirdparty/Chart.js.git/commitdiff
use correct option for setting tension on radar charts
authoretimberg <evert.timberg@gmail.com>
Mon, 14 Nov 2016 01:55:54 +0000 (20:55 -0500)
committerEvert Timberg <evert.timberg+github@gmail.com>
Mon, 14 Nov 2016 12:27:01 +0000 (07:27 -0500)
src/controllers/controller.radar.js
test/controller.radar.tests.js

index cd62da4768e1dd5ead24a304cfd3132fcee12b52..fc0c4a285c9e89f03735c2216f9ea839105494a4 100644 (file)
@@ -95,7 +95,7 @@ module.exports = function(Chart) {
                                        y: reset ? scale.yCenter : pointPosition.y,
 
                                        // Appearance
-                                       tension: custom.tension ? custom.tension : helpers.getValueOrDefault(dataset.tension, me.chart.options.elements.line.tension),
+                                       tension: custom.tension ? custom.tension : helpers.getValueOrDefault(dataset.lineTension, me.chart.options.elements.line.tension),
                                        radius: custom.radius ? custom.radius : helpers.getValueAtIndexOrDefault(dataset.pointRadius, index, pointElementOptions.radius),
                                        backgroundColor: custom.backgroundColor ? custom.backgroundColor : helpers.getValueAtIndexOrDefault(dataset.pointBackgroundColor, index, pointElementOptions.backgroundColor),
                                        borderColor: custom.borderColor ? custom.borderColor : helpers.getValueAtIndexOrDefault(dataset.pointBorderColor, index, pointElementOptions.borderColor),
index 449d295c9c484d5965c4f6b3d383a3873ade6447..b3ee711e16a9fdf2437c57f7f72c8e15ee807d5e 100644 (file)
@@ -179,7 +179,7 @@ describe('Radar controller tests', function() {
                });
 
                // Use dataset level styles for lines & points
-               chart.data.datasets[0].tension = 0;
+               chart.data.datasets[0].lineTension = 0;
                chart.data.datasets[0].backgroundColor = 'rgb(98, 98, 98)';
                chart.data.datasets[0].borderColor = 'rgb(8, 8, 8)';
                chart.data.datasets[0].borderWidth = 0.55;