From: Evert Timberg <evert.timberg+github@gmail.com>
Date: Thu, 12 May 2016 22:57:22 +0000 (-0400)
Subject: Merge branch 'master' into file-size-reduction
X-Git-Tag: v2.1.4~32^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2491%2Fhead;p=thirdparty%2FChart.js.git

Merge branch 'master' into file-size-reduction

Conflicts:
	src/controllers/controller.doughnut.js
	src/controllers/controller.polarArea.js
---

14021069c39814f0dba119acc1ca03f36700ff22
diff --cc src/core/core.datasetController.js
index e483e3f3e,dad49e234..cfd069ef8
--- a/src/core/core.datasetController.js
+++ b/src/core/core.datasetController.js
@@@ -71,36 -71,9 +71,37 @@@ module.exports = function(Chart) 
  		// Controllers should implement the following
  		addElements: noop,
  		addElementAndReset: noop,
 -		draw: noop,
 -		removeHoverStyle: noop,
 -		setHoverStyle: noop,
 +		draw: function(ease) {
 +			var easingDecimal = ease || 1;
 +			helpers.each(this.getMeta().data, function(element, index) {
 +				element.transition(easingDecimal).draw();
 +			});
 +		},
 +		removeHoverStyle: function(element, elementOpts) {
 +			var dataset = this.chart.data.datasets[element._datasetIndex],
 +				index = element._index,
 +				custom = element.custom,
 +				valueOrDefault = helpers.getValueAtIndexOrDefault,
 +				color = helpers.color,
 +				model = element._model;
 +
 +			model.backgroundColor = custom && custom.backgroundColor ? custom.backgroundColor : valueOrDefault(dataset.backgroundColor, index, elementOpts.backgroundColor);
 +			model.borderColor = custom && custom.borderColor ? custom.borderColor : valueOrDefault(dataset.borderColor, index, elementOpts.borderColor);
 +			model.borderWidth = custom && custom.borderWidth ? custom.borderWidth : valueOrDefault(dataset.borderWidth, index, elementOpts.borderWidth);
 +		},
 +		setHoverStyle: function(element) {
 +			var dataset = this.chart.data.datasets[element._datasetIndex],
 +				index = element._index,
 +				custom = element.custom,
 +				valueOrDefault = helpers.getValueAtIndexOrDefault,
 +				color = helpers.color,
++				getHoverColor = helpers.getHoverColor,
 +				model = element._model;
 +
- 			model.backgroundColor = custom && custom.hoverBackgroundColor ? custom.hoverBackgroundColor : valueOrDefault(dataset.hoverBackgroundColor, index, color(model.backgroundColor).saturate(0.5).darken(0.1).rgbString());
- 			model.borderColor = custom && custom.hoverBorderColor ? custom.hoverBorderColor : valueOrDefault(dataset.hoverBorderColor, index, color(model.borderColor).saturate(0.5).darken(0.1).rgbString());
++			model.backgroundColor = custom && custom.hoverBackgroundColor ? custom.hoverBackgroundColor : valueOrDefault(dataset.hoverBackgroundColor, index, getHoverColor(model.backgroundColor));
++			model.borderColor = custom && custom.hoverBorderColor ? custom.hoverBorderColor : valueOrDefault(dataset.hoverBorderColor, index, getHoverColor(model.borderColor));
 +			model.borderWidth = custom && custom.hoverBorderWidth ? custom.hoverBorderWidth : valueOrDefault(dataset.hoverBorderWidth, index, model.borderWidth);
 +		},
  		update: noop
  	});