Rename dataset-specific options "radius" to "pointRadius" and "hitRadius" to "pointHi...

diff --git a/src/controllers/controller.line.js b/src/controllers/controller.line.js
index ec524c5ab62b859d688e08a8938ca34626ddd2c6..a62b285acbf20a962925a24853cd368f824c2d32 100644 (file)
--- a/src/controllers/controller.line.js
+++ b/src/controllers/controller.line.js
@@ -185,17 +185,28 @@ module.exports = function(Chart) {
                        point._index = index;
 
                        // Desired view properties
+
+                       // Compatibility: If the properties are defined with only the old name, use those values
+                       if ((this.getDataset().radius !== undefined) && (this.getDataset().pointRadius === undefined))
+                       {
+                               this.getDataset().pointRadius = this.getDataset().radius;
+                       }
+                       if ((this.getDataset().hitRadius !== undefined) && (this.getDataset().pointHitRadius === undefined))
+                       {
+                               this.getDataset().pointHitRadius = this.getDataset().hitRadius;
+                       }
+
                        point._model = {
                                x: xScale.getPixelForValue(this.getDataset().data[index], index, this.index, this.chart.isCombo),
                                y: reset ? scaleBase : this.calculatePointY(this.getDataset().data[index], index, this.index, this.chart.isCombo),
                                // Appearance
-                               radius: point.custom && point.custom.radius ? point.custom.radius : helpers.getValueAtIndexOrDefault(this.getDataset().radius, index, this.chart.options.elements.point.radius),
+                               radius: point.custom && point.custom.radius ? point.custom.radius : helpers.getValueAtIndexOrDefault(this.getDataset().pointRadius, index, this.chart.options.elements.point.radius),
                                pointStyle: point.custom && point.custom.pointStyle ? point.custom.pointStyle : helpers.getValueAtIndexOrDefault(this.getDataset().pointStyle, index, this.chart.options.elements.point.pointStyle),
                                backgroundColor: this.getPointBackgroundColor(point, index),
                                borderColor: this.getPointBorderColor(point, index),
                                borderWidth: this.getPointBorderWidth(point, index),
                                // Tooltip
-                               hitRadius: point.custom && point.custom.hitRadius ? point.custom.hitRadius : helpers.getValueAtIndexOrDefault(this.getDataset().hitRadius, index, this.chart.options.elements.point.hitRadius)
+                               hitRadius: point.custom && point.custom.hitRadius ? point.custom.hitRadius : helpers.getValueAtIndexOrDefault(this.getDataset().pointHitRadius, index, this.chart.options.elements.point.hitRadius)
                        };
 
                        point._model.skip = point.custom && point.custom.skip ? point.custom.skip : (isNaN(point._model.x) || isNaN(point._model.y));
@@ -287,7 +298,13 @@ module.exports = function(Chart) {
                        var dataset = this.chart.data.datasets[point._datasetIndex];
                        var index = point._index;
 
-                       point._model.radius = point.custom && point.custom.radius ? point.custom.radius : helpers.getValueAtIndexOrDefault(this.getDataset().radius, index, this.chart.options.elements.point.radius);
+                       // Compatibility: If the properties are defined with only the old name, use those values
+                       if ((this.getDataset().radius !== undefined) && (this.getDataset().pointRadius === undefined))
+                       {
+                               this.getDataset().pointRadius = this.getDataset().radius;
+                       }
+
+                       point._model.radius = point.custom && point.custom.radius ? point.custom.radius : helpers.getValueAtIndexOrDefault(this.getDataset().pointRadius, index, this.chart.options.elements.point.radius);
                        point._model.backgroundColor = this.getPointBackgroundColor(point, index);
                        point._model.borderColor = this.getPointBorderColor(point, index);
                        point._model.borderWidth = this.getPointBorderWidth(point, index);