Refactoring using helpers.options.resolve (#5965)

2026-03-10 10:16:50 +01:00 · 2019-01-08 23:50:33 +08:00
parent dd3564aee5
commit 820debf452
18 changed files with 166 additions and 163 deletions
--- a/src/controllers/controller.bar.js
+++ b/src/controllers/controller.bar.js
@@ -5,6 +5,8 @@ var defaults = require('../core/core.defaults');
 var elements = require('../elements/index');
 var helpers = require('../helpers/index');

+var resolve = helpers.options.resolve;
+
 defaults._set('bar', {
 	hover: {
 		mode: 'label'
@@ -410,7 +412,6 @@ module.exports = DatasetController.extend({
 		var dataset = datasets[me.index];
 		var custom = rectangle.custom || {};
 		var options = chart.options.elements.rectangle;
-		var resolve = helpers.options.resolve;
 		var values = {};
 		var i, ilen, key;

--- a/src/controllers/controller.bubble.js
+++ b/src/controllers/controller.bubble.js
@@ -5,6 +5,9 @@ var defaults = require('../core/core.defaults');
 var elements = require('../elements/index');
 var helpers = require('../helpers/index');

+var valueOrDefault = helpers.valueOrDefault;
+var resolve = helpers.options.resolve;
+
 defaults._set('bubble', {
 	hover: {
 		mode: 'single'
@@ -101,6 +104,7 @@ module.exports = DatasetController.extend({
 	setHoverStyle: function(point) {
 		var model = point._model;
 		var options = point._options;
+		var getHoverColor = helpers.getHoverColor;

 		point.$previousStyle = {
 			backgroundColor: model.backgroundColor,
@@ -109,9 +113,9 @@ module.exports = DatasetController.extend({
 			radius: model.radius
 		};

-		model.backgroundColor = helpers.valueOrDefault(options.hoverBackgroundColor, helpers.getHoverColor(options.backgroundColor));
-		model.borderColor = helpers.valueOrDefault(options.hoverBorderColor, helpers.getHoverColor(options.borderColor));
-		model.borderWidth = helpers.valueOrDefault(options.hoverBorderWidth, options.borderWidth);
+		model.backgroundColor = valueOrDefault(options.hoverBackgroundColor, getHoverColor(options.backgroundColor));
+		model.borderColor = valueOrDefault(options.hoverBorderColor, getHoverColor(options.borderColor));
+		model.borderWidth = valueOrDefault(options.hoverBorderWidth, options.borderWidth);
 		model.radius = options.radius + options.hoverRadius;
 	},

@@ -125,7 +129,6 @@ module.exports = DatasetController.extend({
 		var dataset = datasets[me.index];
 		var custom = point.custom || {};
 		var options = chart.options.elements.point;
-		var resolve = helpers.options.resolve;
 		var data = dataset.data[index];
 		var values = {};
 		var i, ilen, key;
--- a/src/controllers/controller.doughnut.js
+++ b/src/controllers/controller.doughnut.js
@@ -5,6 +5,8 @@ var defaults = require('../core/core.defaults');
 var elements = require('../elements/index');
 var helpers = require('../helpers/index');

+var resolve = helpers.options.resolve;
+
 defaults._set('doughnut', {
 	animation: {
 		// Boolean - Whether we animate the rotation of the Doughnut
@@ -46,11 +48,10 @@ defaults._set('doughnut', {
 						var ds = data.datasets[0];
 						var arc = meta.data[i];
 						var custom = arc && arc.custom || {};
-						var valueAtIndexOrDefault = helpers.valueAtIndexOrDefault;
 						var arcOpts = chart.options.elements.arc;
-						var fill = custom.backgroundColor ? custom.backgroundColor : valueAtIndexOrDefault(ds.backgroundColor, i, arcOpts.backgroundColor);
-						var stroke = custom.borderColor ? custom.borderColor : valueAtIndexOrDefault(ds.borderColor, i, arcOpts.borderColor);
-						var bw = custom.borderWidth ? custom.borderWidth : valueAtIndexOrDefault(ds.borderWidth, i, arcOpts.borderWidth);
+						var fill = resolve([custom.backgroundColor, ds.backgroundColor, arcOpts.backgroundColor], undefined, i);
+						var stroke = resolve([custom.borderColor, ds.borderColor, arcOpts.borderColor], undefined, i);
+						var bw = resolve([custom.borderWidth, ds.borderWidth, arcOpts.borderWidth], undefined, i);

 						return {
 							text: label,
@@ -322,13 +323,12 @@ module.exports = DatasetController.extend({
 		var dataset = me.getDataset();
 		var custom = arc.custom || {};
 		var options = me.chart.options.elements.arc;
-		var valueAtIndexOrDefault = helpers.valueAtIndexOrDefault;

 		return {
-			backgroundColor: custom.backgroundColor ? custom.backgroundColor : valueAtIndexOrDefault(dataset.backgroundColor, index, options.backgroundColor),
-			borderColor: custom.borderColor ? custom.borderColor : valueAtIndexOrDefault(dataset.borderColor, index, options.borderColor),
-			borderWidth: custom.borderWidth ? custom.borderWidth : valueAtIndexOrDefault(dataset.borderWidth, index, options.borderWidth),
-			borderAlign: custom.borderAlign ? custom.borderAlign : valueAtIndexOrDefault(dataset.borderAlign, index, options.borderAlign)
+			backgroundColor: resolve([custom.backgroundColor, dataset.backgroundColor, options.backgroundColor], undefined, index),
+			borderColor: resolve([custom.borderColor, dataset.borderColor, options.borderColor], undefined, index),
+			borderWidth: resolve([custom.borderWidth, dataset.borderWidth, options.borderWidth], undefined, index),
+			borderAlign: resolve([custom.borderAlign, dataset.borderAlign, options.borderAlign], undefined, index)
 		};
 	}
 });
--- a/src/controllers/controller.line.js
+++ b/src/controllers/controller.line.js
@@ -5,7 +5,9 @@ var defaults = require('../core/core.defaults');
 var elements = require('../elements/index');
 var helpers = require('../helpers/index');

-var _isPointInArea = helpers.canvas._isPointInArea;
+var valueOrDefault = helpers.valueOrDefault;
+var resolve = helpers.options.resolve;
+var isPointInArea = helpers.canvas._isPointInArea;

 defaults._set('line', {
 	showLines: true,
@@ -28,7 +30,7 @@ defaults._set('line', {
 });

 function lineEnabled(dataset, options) {
-	return helpers.valueOrDefault(dataset.showLine, options.showLines);
+	return valueOrDefault(dataset.showLine, options.showLines);
 }

 module.exports = DatasetController.extend({
@@ -69,18 +71,18 @@ 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
-				spanGaps: dataset.spanGaps ? dataset.spanGaps : options.spanGaps,
-				tension: custom.tension ? custom.tension : helpers.valueOrDefault(dataset.lineTension, lineElementOptions.tension),
-				backgroundColor: custom.backgroundColor ? custom.backgroundColor : (dataset.backgroundColor || lineElementOptions.backgroundColor),
-				borderWidth: custom.borderWidth ? custom.borderWidth : (dataset.borderWidth || lineElementOptions.borderWidth),
-				borderColor: custom.borderColor ? custom.borderColor : (dataset.borderColor || lineElementOptions.borderColor),
-				borderCapStyle: custom.borderCapStyle ? custom.borderCapStyle : (dataset.borderCapStyle || lineElementOptions.borderCapStyle),
-				borderDash: custom.borderDash ? custom.borderDash : (dataset.borderDash || lineElementOptions.borderDash),
-				borderDashOffset: custom.borderDashOffset ? custom.borderDashOffset : (dataset.borderDashOffset || lineElementOptions.borderDashOffset),
-				borderJoinStyle: custom.borderJoinStyle ? custom.borderJoinStyle : (dataset.borderJoinStyle || lineElementOptions.borderJoinStyle),
-				fill: custom.fill ? custom.fill : (dataset.fill !== undefined ? dataset.fill : lineElementOptions.fill),
-				steppedLine: custom.steppedLine ? custom.steppedLine : helpers.valueOrDefault(dataset.steppedLine, lineElementOptions.stepped),
-				cubicInterpolationMode: custom.cubicInterpolationMode ? custom.cubicInterpolationMode : helpers.valueOrDefault(dataset.cubicInterpolationMode, lineElementOptions.cubicInterpolationMode),
+				spanGaps: valueOrDefault(dataset.spanGaps, options.spanGaps),
+				tension: resolve([custom.tension, dataset.lineTension, lineElementOptions.tension]),
+				backgroundColor: resolve([custom.backgroundColor, dataset.backgroundColor, lineElementOptions.backgroundColor]),
+				borderWidth: resolve([custom.borderWidth, dataset.borderWidth, lineElementOptions.borderWidth]),
+				borderColor: resolve([custom.borderColor, dataset.borderColor, lineElementOptions.borderColor]),
+				borderCapStyle: resolve([custom.borderCapStyle, dataset.borderCapStyle, lineElementOptions.borderCapStyle]),
+				borderDash: resolve([custom.borderDash, dataset.borderDash, lineElementOptions.borderDash]),
+				borderDashOffset: resolve([custom.borderDashOffset, dataset.borderDashOffset, lineElementOptions.borderDashOffset]),
+				borderJoinStyle: resolve([custom.borderJoinStyle, dataset.borderJoinStyle, lineElementOptions.borderJoinStyle]),
+				fill: resolve([custom.fill, dataset.fill, lineElementOptions.fill]),
+				steppedLine: resolve([custom.steppedLine, dataset.steppedLine, lineElementOptions.stepped]),
+				cubicInterpolationMode: resolve([custom.cubicInterpolationMode, dataset.cubicInterpolationMode, lineElementOptions.cubicInterpolationMode]),
 			};

 			line.pivot();
@@ -102,64 +104,49 @@ module.exports = DatasetController.extend({
 	},

 	getPointBackgroundColor: function(point, index) {
-		var backgroundColor = this.chart.options.elements.point.backgroundColor;
 		var dataset = this.getDataset();
 		var custom = point.custom || {};

-		if (custom.backgroundColor) {
-			backgroundColor = custom.backgroundColor;
-		} else if (dataset.pointBackgroundColor) {
-			backgroundColor = helpers.valueAtIndexOrDefault(dataset.pointBackgroundColor, index, backgroundColor);
-		} else if (dataset.backgroundColor) {
-			backgroundColor = dataset.backgroundColor;
-		}
-
-		return backgroundColor;
+		return resolve([
+			custom.backgroundColor,
+			dataset.pointBackgroundColor,
+			dataset.backgroundColor,
+			this.chart.options.elements.point.backgroundColor
+		], undefined, index);
 	},

 	getPointBorderColor: function(point, index) {
-		var borderColor = this.chart.options.elements.point.borderColor;
 		var dataset = this.getDataset();
 		var custom = point.custom || {};

-		if (custom.borderColor) {
-			borderColor = custom.borderColor;
-		} else if (dataset.pointBorderColor) {
-			borderColor = helpers.valueAtIndexOrDefault(dataset.pointBorderColor, index, borderColor);
-		} else if (dataset.borderColor) {
-			borderColor = dataset.borderColor;
-		}
-
-		return borderColor;
+		return resolve([
+			custom.borderColor,
+			dataset.pointBorderColor,
+			dataset.borderColor,
+			this.chart.options.elements.point.borderColor
+		], undefined, index);
 	},

 	getPointBorderWidth: function(point, index) {
-		var borderWidth = this.chart.options.elements.point.borderWidth;
 		var dataset = this.getDataset();
 		var custom = point.custom || {};

-		if (!isNaN(custom.borderWidth)) {
-			borderWidth = custom.borderWidth;
-		} else if (!isNaN(dataset.pointBorderWidth) || helpers.isArray(dataset.pointBorderWidth)) {
-			borderWidth = helpers.valueAtIndexOrDefault(dataset.pointBorderWidth, index, borderWidth);
-		} else if (!isNaN(dataset.borderWidth)) {
-			borderWidth = dataset.borderWidth;
-		}
-
-		return borderWidth;
+		return resolve([
+			custom.borderWidth,
+			dataset.pointBorderWidth,
+			dataset.borderWidth,
+			this.chart.options.elements.point.borderWidth
+		], undefined, index);
 	},

 	getPointRotation: function(point, index) {
-		var pointRotation = this.chart.options.elements.point.rotation;
-		var dataset = this.getDataset();
 		var custom = point.custom || {};

-		if (!isNaN(custom.rotation)) {
-			pointRotation = custom.rotation;
-		} else if (!isNaN(dataset.pointRotation) || helpers.isArray(dataset.pointRotation)) {
-			pointRotation = helpers.valueAtIndexOrDefault(dataset.pointRotation, index, pointRotation);
-		}
-		return pointRotation;
+		return resolve([
+			custom.rotation,
+			this.getDataset().pointRotation,
+			this.chart.options.elements.point.rotation
+		], undefined, index);
 	},

 	updateElement: function(point, index, reset) {
@@ -197,8 +184,8 @@ module.exports = DatasetController.extend({
 			y: y,
 			skip: custom.skip || isNaN(x) || isNaN(y),
 			// Appearance
-			radius: custom.radius || helpers.valueAtIndexOrDefault(dataset.pointRadius, index, pointOptions.radius),
-			pointStyle: custom.pointStyle || helpers.valueAtIndexOrDefault(dataset.pointStyle, index, pointOptions.pointStyle),
+			radius: resolve([custom.radius, dataset.pointRadius, pointOptions.radius], undefined, index),
+			pointStyle: resolve([custom.pointStyle, dataset.pointStyle, pointOptions.pointStyle], undefined, index),
 			rotation: me.getPointRotation(point, index),
 			backgroundColor: me.getPointBackgroundColor(point, index),
 			borderColor: me.getPointBorderColor(point, index),
@@ -206,7 +193,7 @@ module.exports = DatasetController.extend({
 			tension: meta.dataset._model ? meta.dataset._model.tension : 0,
 			steppedLine: meta.dataset._model ? meta.dataset._model.steppedLine : false,
 			// Tooltip
-			hitRadius: custom.hitRadius || helpers.valueAtIndexOrDefault(dataset.pointHitRadius, index, pointOptions.hitRadius)
+			hitRadius: resolve([custom.hitRadius, dataset.pointHitRadius, pointOptions.hitRadius], undefined, index)
 		};
 	},

@@ -285,12 +272,12 @@ module.exports = DatasetController.extend({
 		if (chart.options.elements.line.capBezierPoints) {
 			for (i = 0, ilen = points.length; i < ilen; ++i) {
 				model = points[i]._model;
-				if (_isPointInArea(model, area)) {
-					if (i > 0 && _isPointInArea(points[i - 1]._model, area)) {
+				if (isPointInArea(model, area)) {
+					if (i > 0 && isPointInArea(points[i - 1]._model, area)) {
 						model.controlPointPreviousX = capControlPoint(model.controlPointPreviousX, area.left, area.right);
 						model.controlPointPreviousY = capControlPoint(model.controlPointPreviousY, area.top, area.bottom);
 					}
-					if (i < points.length - 1 && _isPointInArea(points[i + 1]._model, area)) {
+					if (i < points.length - 1 && isPointInArea(points[i + 1]._model, area)) {
 						model.controlPointNextX = capControlPoint(model.controlPointNextX, area.left, area.right);
 						model.controlPointNextY = capControlPoint(model.controlPointNextY, area.top, area.bottom);
 					}
@@ -336,6 +323,7 @@ module.exports = DatasetController.extend({
 		var index = element._index;
 		var custom = element.custom || {};
 		var model = element._model;
+		var getHoverColor = helpers.getHoverColor;

 		element.$previousStyle = {
 			backgroundColor: model.backgroundColor,
@@ -344,9 +332,9 @@ module.exports = DatasetController.extend({
 			radius: model.radius
 		};

-		model.backgroundColor = custom.hoverBackgroundColor || helpers.valueAtIndexOrDefault(dataset.pointHoverBackgroundColor, index, helpers.getHoverColor(model.backgroundColor));
-		model.borderColor = custom.hoverBorderColor || helpers.valueAtIndexOrDefault(dataset.pointHoverBorderColor, index, helpers.getHoverColor(model.borderColor));
-		model.borderWidth = custom.hoverBorderWidth || helpers.valueAtIndexOrDefault(dataset.pointHoverBorderWidth, index, model.borderWidth);
-		model.radius = custom.hoverRadius || helpers.valueAtIndexOrDefault(dataset.pointHoverRadius, index, this.chart.options.elements.point.hoverRadius);
+		model.backgroundColor = resolve([custom.hoverBackgroundColor, dataset.pointHoverBackgroundColor, getHoverColor(model.backgroundColor)], undefined, index);
+		model.borderColor = resolve([custom.hoverBorderColor, dataset.pointHoverBorderColor, getHoverColor(model.borderColor)], undefined, index);
+		model.borderWidth = resolve([custom.hoverBorderWidth, dataset.pointHoverBorderWidth, model.borderWidth], undefined, index);
+		model.radius = resolve([custom.hoverRadius, dataset.pointHoverRadius, this.chart.options.elements.point.hoverRadius], undefined, index);
 	}
 });
--- a/src/controllers/controller.polarArea.js
+++ b/src/controllers/controller.polarArea.js
@@ -5,6 +5,8 @@ var defaults = require('../core/core.defaults');
 var elements = require('../elements/index');
 var helpers = require('../helpers/index');

+var resolve = helpers.options.resolve;
+
 defaults._set('polarArea', {
 	scale: {
 		type: 'radialLinear',
@@ -60,11 +62,10 @@ defaults._set('polarArea', {
 						var ds = data.datasets[0];
 						var arc = meta.data[i];
 						var custom = arc.custom || {};
-						var valueAtIndexOrDefault = helpers.valueAtIndexOrDefault;
 						var arcOpts = chart.options.elements.arc;
-						var fill = custom.backgroundColor ? custom.backgroundColor : valueAtIndexOrDefault(ds.backgroundColor, i, arcOpts.backgroundColor);
-						var stroke = custom.borderColor ? custom.borderColor : valueAtIndexOrDefault(ds.borderColor, i, arcOpts.borderColor);
-						var bw = custom.borderWidth ? custom.borderWidth : valueAtIndexOrDefault(ds.borderWidth, i, arcOpts.borderWidth);
+						var fill = resolve([custom.backgroundColor, ds.backgroundColor, arcOpts.backgroundColor], undefined, i);
+						var stroke = resolve([custom.borderColor, ds.borderColor, arcOpts.borderColor], undefined, i);
+						var bw = resolve([custom.borderWidth, ds.borderWidth, arcOpts.borderWidth], undefined, i);

 						return {
 							text: label,
@@ -199,13 +200,12 @@ module.exports = DatasetController.extend({
 		// Apply border and fill style
 		var elementOpts = this.chart.options.elements.arc;
 		var custom = arc.custom || {};
-		var valueOrDefault = helpers.valueAtIndexOrDefault;
 		var model = arc._model;

-		model.backgroundColor = custom.backgroundColor ? custom.backgroundColor : valueOrDefault(dataset.backgroundColor, index, elementOpts.backgroundColor);
-		model.borderColor = custom.borderColor ? custom.borderColor : valueOrDefault(dataset.borderColor, index, elementOpts.borderColor);
-		model.borderWidth = custom.borderWidth ? custom.borderWidth : valueOrDefault(dataset.borderWidth, index, elementOpts.borderWidth);
-		model.borderAlign = custom.borderAlign ? custom.borderAlign : valueOrDefault(dataset.borderAlign, index, elementOpts.borderAlign);
+		model.backgroundColor = resolve([custom.backgroundColor, dataset.backgroundColor, elementOpts.backgroundColor], undefined, index);
+		model.borderColor = resolve([custom.borderColor, dataset.borderColor, elementOpts.borderColor], undefined, index);
+		model.borderWidth = resolve([custom.borderWidth, dataset.borderWidth, elementOpts.borderWidth], undefined, index);
+		model.borderAlign = resolve([custom.borderAlign, dataset.borderAlign, elementOpts.borderAlign], undefined, index);

 		arc.pivot();
 	},
@@ -245,7 +245,7 @@ module.exports = DatasetController.extend({
 			datasetIndex: me.index
 		};

-		return helpers.options.resolve([
+		return resolve([
 			me.chart.options.elements.arc.angle,
 			(2 * Math.PI) / count
 		], context, index);
--- a/src/controllers/controller.radar.js
+++ b/src/controllers/controller.radar.js
@@ -5,6 +5,8 @@ var defaults = require('../core/core.defaults');
 var elements = require('../elements/index');
 var helpers = require('../helpers/index');

+var resolve = helpers.options.resolve;
+
 defaults._set('radar', {
 	scale: {
 		type: 'radialLinear'
@@ -50,15 +52,15 @@ module.exports = DatasetController.extend({
 			// Model
 			_model: {
 				// Appearance
-				tension: custom.tension ? custom.tension : helpers.valueOrDefault(dataset.lineTension, lineElementOptions.tension),
-				backgroundColor: custom.backgroundColor ? custom.backgroundColor : (dataset.backgroundColor || lineElementOptions.backgroundColor),
-				borderWidth: custom.borderWidth ? custom.borderWidth : (dataset.borderWidth || lineElementOptions.borderWidth),
-				borderColor: custom.borderColor ? custom.borderColor : (dataset.borderColor || lineElementOptions.borderColor),
-				fill: custom.fill ? custom.fill : (dataset.fill !== undefined ? dataset.fill : lineElementOptions.fill),
-				borderCapStyle: custom.borderCapStyle ? custom.borderCapStyle : (dataset.borderCapStyle || lineElementOptions.borderCapStyle),
-				borderDash: custom.borderDash ? custom.borderDash : (dataset.borderDash || lineElementOptions.borderDash),
-				borderDashOffset: custom.borderDashOffset ? custom.borderDashOffset : (dataset.borderDashOffset || lineElementOptions.borderDashOffset),
-				borderJoinStyle: custom.borderJoinStyle ? custom.borderJoinStyle : (dataset.borderJoinStyle || lineElementOptions.borderJoinStyle),
+				tension: resolve([custom.tension, dataset.lineTension, lineElementOptions.tension]),
+				backgroundColor: resolve([custom.backgroundColor, dataset.backgroundColor, lineElementOptions.backgroundColor]),
+				borderWidth: resolve([custom.borderWidth, dataset.borderWidth, lineElementOptions.borderWidth]),
+				borderColor: resolve([custom.borderColor, dataset.borderColor, lineElementOptions.borderColor]),
+				fill: resolve([custom.fill, dataset.fill, lineElementOptions.fill]),
+				borderCapStyle: resolve([custom.borderCapStyle, dataset.borderCapStyle, lineElementOptions.borderCapStyle]),
+				borderDash: resolve([custom.borderDash, dataset.borderDash, lineElementOptions.borderDash]),
+				borderDashOffset: resolve([custom.borderDashOffset, dataset.borderDashOffset, lineElementOptions.borderDashOffset]),
+				borderJoinStyle: resolve([custom.borderJoinStyle, dataset.borderJoinStyle, lineElementOptions.borderJoinStyle]),
 			}
 		});

@@ -106,20 +108,20 @@ module.exports = DatasetController.extend({
 				y: reset ? scale.yCenter : pointPosition.y,

 				// Appearance
-				tension: custom.tension ? custom.tension : helpers.valueOrDefault(dataset.lineTension, me.chart.options.elements.line.tension),
-				radius: custom.radius ? custom.radius : helpers.valueAtIndexOrDefault(dataset.pointRadius, index, pointElementOptions.radius),
-				backgroundColor: custom.backgroundColor ? custom.backgroundColor : helpers.valueAtIndexOrDefault(dataset.pointBackgroundColor, index, pointElementOptions.backgroundColor),
-				borderColor: custom.borderColor ? custom.borderColor : helpers.valueAtIndexOrDefault(dataset.pointBorderColor, index, pointElementOptions.borderColor),
-				borderWidth: custom.borderWidth ? custom.borderWidth : helpers.valueAtIndexOrDefault(dataset.pointBorderWidth, index, pointElementOptions.borderWidth),
-				pointStyle: custom.pointStyle ? custom.pointStyle : helpers.valueAtIndexOrDefault(dataset.pointStyle, index, pointElementOptions.pointStyle),
-				rotation: custom.rotation ? custom.rotation : helpers.valueAtIndexOrDefault(dataset.pointRotation, index, pointElementOptions.rotation),
+				tension: resolve([custom.tension, dataset.lineTension, me.chart.options.elements.line.tension]),
+				radius: resolve([custom.radius, dataset.pointRadius, pointElementOptions.radius], undefined, index),
+				backgroundColor: resolve([custom.backgroundColor, dataset.pointBackgroundColor, pointElementOptions.backgroundColor], undefined, index),
+				borderColor: resolve([custom.borderColor, dataset.pointBorderColor, pointElementOptions.borderColor], undefined, index),
+				borderWidth: resolve([custom.borderWidth, dataset.pointBorderWidth, pointElementOptions.borderWidth], undefined, index),
+				pointStyle: resolve([custom.pointStyle, dataset.pointStyle, pointElementOptions.pointStyle], undefined, index),
+				rotation: resolve([custom.rotation, dataset.pointRotation, pointElementOptions.rotation], undefined, index),

 				// Tooltip
-				hitRadius: custom.hitRadius ? custom.hitRadius : helpers.valueAtIndexOrDefault(dataset.pointHitRadius, index, pointElementOptions.hitRadius)
+				hitRadius: resolve([custom.hitRadius, dataset.pointHitRadius, pointElementOptions.hitRadius], undefined, index)
 			}
 		});

-		point._model.skip = custom.skip ? custom.skip : (isNaN(point._model.x) || isNaN(point._model.y));
+		point._model.skip = custom.skip || isNaN(point._model.x) || isNaN(point._model.y);
 	},

 	updateBezierControlPoints: function() {
@@ -156,6 +158,7 @@ module.exports = DatasetController.extend({
 		var custom = point.custom || {};
 		var index = point._index;
 		var model = point._model;
+		var getHoverColor = helpers.getHoverColor;

 		point.$previousStyle = {
 			backgroundColor: model.backgroundColor,
@@ -164,9 +167,9 @@ module.exports = DatasetController.extend({
 			radius: model.radius
 		};

-		model.radius = custom.hoverRadius ? custom.hoverRadius : helpers.valueAtIndexOrDefault(dataset.pointHoverRadius, index, this.chart.options.elements.point.hoverRadius);
-		model.backgroundColor = custom.hoverBackgroundColor ? custom.hoverBackgroundColor : helpers.valueAtIndexOrDefault(dataset.pointHoverBackgroundColor, index, helpers.getHoverColor(model.backgroundColor));
-		model.borderColor = custom.hoverBorderColor ? custom.hoverBorderColor : helpers.valueAtIndexOrDefault(dataset.pointHoverBorderColor, index, helpers.getHoverColor(model.borderColor));
-		model.borderWidth = custom.hoverBorderWidth ? custom.hoverBorderWidth : helpers.valueAtIndexOrDefault(dataset.pointHoverBorderWidth, index, model.borderWidth);
+		model.radius = resolve([custom.hoverRadius, dataset.pointHoverRadius, this.chart.options.elements.point.hoverRadius], undefined, index);
+		model.backgroundColor = resolve([custom.hoverBackgroundColor, dataset.pointHoverBackgroundColor, getHoverColor(model.backgroundColor)], undefined, index);
+		model.borderColor = resolve([custom.hoverBorderColor, dataset.pointHoverBorderColor, getHoverColor(model.borderColor)], undefined, index);
+		model.borderWidth = resolve([custom.hoverBorderWidth, dataset.pointHoverBorderWidth, model.borderWidth], undefined, index);
 	}
 });