From: etimberg <evert.timberg@gmail.com>
Date: Mon, 14 Nov 2016 01:55:54 +0000 (-0500)
Subject: use correct option for setting tension on radar charts
X-Git-Tag: v2.5.0~1^2~56
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=339265d21edcb470213055294002edd3db4036d5;p=thirdparty%2FChart.js.git

use correct option for setting tension on radar charts
---

diff --git a/src/controllers/controller.radar.js b/src/controllers/controller.radar.js
index cd62da476..fc0c4a285 100644
--- a/src/controllers/controller.radar.js
+++ b/src/controllers/controller.radar.js
@@ -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),
diff --git a/test/controller.radar.tests.js b/test/controller.radar.tests.js
index 449d295c9..b3ee711e1 100644
--- a/test/controller.radar.tests.js
+++ b/test/controller.radar.tests.js
@@ -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;