From 48368117e9a3fd2e26f2bfc2d110f4472c6912c1 Mon Sep 17 00:00:00 2001
From: Evert Timberg <evert.timberg+github@gmail.com>
Date: Sat, 14 May 2016 15:59:40 -0400
Subject: [PATCH 01/10] Helpers improvements

---
 src/core/core.helpers.js | 90 +++++++++++++++++++++-------------------
 1 file changed, 48 insertions(+), 42 deletions(-)

diff --git a/src/core/core.helpers.js b/src/core/core.helpers.js
index 5d4094713..44a22f0e9 100644
--- a/src/core/core.helpers.js
+++ b/src/core/core.helpers.js
@@ -5,7 +5,6 @@
 var color = require('chartjs-color');
 
 module.exports = function(Chart) {
-
 	//Global Chart helpers object for utility methods and classes
 	var helpers = Chart.helpers = {};
 
@@ -194,15 +193,19 @@ module.exports = function(Chart) {
 		}
 	};
 	helpers.where = function(collection, filterCallback) {
-		var filtered = [];
+		if (helpers.isArray(collection) && Array.prototype.filter) {
+			return collection.filter(filterCallback);
+		} else {
+			var filtered = [];
 
-		helpers.each(collection, function(item) {
-			if (filterCallback(item)) {
-				filtered.push(item);
-			}
-		});
+			helpers.each(collection, function(item) {
+				if (filterCallback(item)) {
+					filtered.push(item);
+				}
+			});
 
-		return filtered;
+			return filtered;
+		}
 	};
 	helpers.findIndex = function(arrayToSearch, callback, thisArg) {
 		var index = -1;
@@ -653,9 +656,10 @@ module.exports = function(Chart) {
 			canvas = evt.currentTarget || evt.srcElement,
 			boundingRect = canvas.getBoundingClientRect();
 
-		if (e.touches && e.touches.length > 0) {
-			mouseX = e.touches[0].clientX;
-			mouseY = e.touches[0].clientY;
+		var touches = e.touches;
+		if (touches && touches.length > 0) {
+			mouseX = touches[0].clientX;
+			mouseY = touches[0].clientY;
 
 		} else {
 			mouseX = e.clientX;
@@ -703,19 +707,19 @@ module.exports = function(Chart) {
 	};
 	helpers.bindEvents = function(chartInstance, arrayOfEvents, handler) {
 		// Create the events object if it's not already present
-		if (!chartInstance.events)
-			chartInstance.events = {};
+		var events = chartInstance.events = chartInstance.events || {};
 
 		helpers.each(arrayOfEvents, function(eventName) {
-			chartInstance.events[eventName] = function() {
+			events[eventName] = function() {
 				handler.apply(chartInstance, arguments);
 			};
-			helpers.addEvent(chartInstance.chart.canvas, eventName, chartInstance.events[eventName]);
+			helpers.addEvent(chartInstance.chart.canvas, eventName, events[eventName]);
 		});
 	};
 	helpers.unbindEvents = function(chartInstance, arrayOfEvents) {
+		var canvas = chartInstance.chart.canvas;
 		helpers.each(arrayOfEvents, function(handler, eventName) {
-			helpers.removeEvent(chartInstance.chart.canvas, eventName, handler);
+			helpers.removeEvent(canvas, eventName, handler);
 		});
 	};
 
@@ -791,13 +795,14 @@ module.exports = function(Chart) {
 	};
 	helpers.retinaScale = function(chart) {
 		var ctx = chart.ctx;
-		var width = chart.canvas.width;
-		var height = chart.canvas.height;
+		var canvas = chart.canvas;
+		var width = canvas.width;
+		var height = canvas.height;
 		var pixelRatio = chart.currentDevicePixelRatio = window.devicePixelRatio || 1;
 
 		if (pixelRatio !== 1) {
-			ctx.canvas.height = height * pixelRatio;
-			ctx.canvas.width = width * pixelRatio;
+			canvas.height = height * pixelRatio;
+			canvas.width = width * pixelRatio;
 			ctx.scale(pixelRatio, pixelRatio);
 
 			// Store the device pixel ratio so that we can go backwards in `destroy`.
@@ -806,8 +811,8 @@ module.exports = function(Chart) {
 			chart.originalDevicePixelRatio = chart.originalDevicePixelRatio || pixelRatio;
 		}
 
-		ctx.canvas.style.width = width + 'px';
-		ctx.canvas.style.height = height + 'px';
+		canvas.style.width = width + 'px';
+		canvas.style.height = height + 'px';
 	};
 	//-- Canvas methods
 	helpers.clear = function(chart) {
@@ -818,12 +823,12 @@ module.exports = function(Chart) {
 	};
 	helpers.longestText = function(ctx, font, arrayOfStrings, cache) {
 		cache = cache || {};
-		cache.data = cache.data || {};
-		cache.garbageCollect = cache.garbageCollect || [];
+		var data = cache.data = cache.data || {};
+		var gc = cache.garbageCollect = cache.garbageCollect || [];
 
 		if (cache.font !== font) {
-			cache.data = {};
-			cache.garbageCollect = [];
+			data = cache.data = {};
+			gc = cache.garbageCollect = [];
 			cache.font = font;
 		}
 
@@ -832,10 +837,10 @@ module.exports = function(Chart) {
 		helpers.each(arrayOfStrings, function(string) {
 			// Undefined strings should not be measured
 			if (string !== undefined && string !== null) {
-				var textWidth = cache.data[string];
+				var textWidth = data[string];
 				if (!textWidth) {
-					textWidth = cache.data[string] = ctx.measureText(string).width;
-					cache.garbageCollect.push(string);
+					textWidth = data[string] = ctx.measureText(string).width;
+					gc.push(string);
 				}
 
 				if (textWidth > longest) {
@@ -844,12 +849,12 @@ module.exports = function(Chart) {
 			}
 		});
 
-		var gcLen = cache.garbageCollect.length / 2;
+		var gcLen = gc.length / 2;
 		if (gcLen > arrayOfStrings.length) {
 			for (var i = 0; i < gcLen; i++) {
-				delete cache.data[cache.garbageCollect[i]];
+				delete data[gc[i]];
 			}
-			cache.garbageCollect.splice(0, gcLen);
+			gc.splice(0, gcLen);
 		}
 
 		return longest;
@@ -893,16 +898,17 @@ module.exports = function(Chart) {
 		}
 
 		// Set the style
-		hiddenIframe.style.width = '100%';
-		hiddenIframe.style.display = 'block';
-		hiddenIframe.style.border = 0;
-		hiddenIframe.style.height = 0;
-		hiddenIframe.style.margin = 0;
-		hiddenIframe.style.position = 'absolute';
-		hiddenIframe.style.left = 0;
-		hiddenIframe.style.right = 0;
-		hiddenIframe.style.top = 0;
-		hiddenIframe.style.bottom = 0;
+		var style = hiddenIframe.style;
+		style.width = '100%';
+		style.display = 'block';
+		style.border = 0;
+		style.height = 0;
+		style.margin = 0;
+		style.position = 'absolute';
+		style.left = 0;
+		style.right = 0;
+		style.top = 0;
+		style.bottom = 0;
 
 		// Insert the iframe so that contentWindow is available
 		node.insertBefore(hiddenIframe, node.firstChild);

From 577c1406ddaf238c5fea6960bf1bc3fd9ab4210c Mon Sep 17 00:00:00 2001
From: Hagen Schulze <hagen.schulze@nextlabel.de>
Date: Wed, 18 May 2016 20:42:54 +0200
Subject: [PATCH 02/10] This fixes #2589

---
 src/core/core.scale.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/core.scale.js b/src/core/core.scale.js
index 9861288cd..7b1e8e92a 100644
--- a/src/core/core.scale.js
+++ b/src/core/core.scale.js
@@ -530,7 +530,7 @@ module.exports = function(Chart) {
 					var isLastTick = this.ticks.length === index + 1;
 
 					// Since we always show the last tick,we need may need to hide the last shown one before
-					var shouldSkip = (skipRatio > 1 && index % skipRatio > 0) || (index % skipRatio === 0 && index + skipRatio > this.ticks.length);
+					var shouldSkip = (skipRatio > 1 && index % skipRatio > 0) || (index % skipRatio === 0 && index + skipRatio >= this.ticks.length);
 					if (shouldSkip && !isLastTick || (label === undefined || label === null)) {
 						return;
 					}

From a566d16e697c895bcd719ab187c57f8c90daa54c Mon Sep 17 00:00:00 2001
From: Simon Brunel <simonbrunel@users.noreply.github.com>
Date: Fri, 20 May 2016 20:17:28 +0200
Subject: [PATCH 03/10] Refactor scale base pixel and point calculation.

---
 src/controllers/controller.bar.js    | 71 ++++------------------------
 src/controllers/controller.bubble.js | 24 +---------
 src/controllers/controller.line.js   | 34 ++++---------
 src/controllers/controller.radar.js  | 15 +-----
 src/core/core.scale.js               | 12 +++++
 src/scales/scale.radialLinear.js     | 13 +++++
 6 files changed, 46 insertions(+), 123 deletions(-)

diff --git a/src/controllers/controller.bar.js b/src/controllers/controller.bar.js
index fc7f1eb2b..7a6915cf6 100644
--- a/src/controllers/controller.bar.js
+++ b/src/controllers/controller.bar.js
@@ -84,18 +84,7 @@ module.exports = function(Chart) {
 			var meta = this.getMeta();
 			var xScale = this.getScaleForId(meta.xAxisID);
 			var yScale = this.getScaleForId(meta.yAxisID);
-
-			var yScalePoint;
-
-			if (yScale.min < 0 && yScale.max < 0) {
-				// all less than 0. use the top
-				yScalePoint = yScale.getPixelForValue(yScale.max);
-			} else if (yScale.min > 0 && yScale.max > 0) {
-				yScalePoint = yScale.getPixelForValue(yScale.min);
-			} else {
-				yScalePoint = yScale.getPixelForValue(0);
-			}
-
+			var scaleBase = yScale.getBasePixel();
 			var rectangleElementOptions = this.chart.options.elements.rectangle;
 			var custom = rectangle.custom || {};
 			var dataset = this.getDataset();
@@ -112,14 +101,14 @@ module.exports = function(Chart) {
 				// Desired view properties
 				_model: {
 					x: this.calculateBarX(index, this.index),
-					y: reset ? yScalePoint : this.calculateBarY(index, this.index),
+					y: reset ? scaleBase : this.calculateBarY(index, this.index),
 
 					// Tooltip
 					label: this.chart.data.labels[index],
 					datasetLabel: dataset.label,
 
 					// Appearance
-					base: reset ? yScalePoint : this.calculateBarBase(this.index, index),
+					base: reset ? scaleBase : this.calculateBarBase(this.index, index),
 					width: this.calculateBarWidth(index),
 					backgroundColor: custom.backgroundColor ? custom.backgroundColor : helpers.getValueAtIndexOrDefault(dataset.backgroundColor, index, rectangleElementOptions.backgroundColor),
 					borderSkipped: custom.borderSkipped ? custom.borderSkipped : rectangleElementOptions.borderSkipped,
@@ -132,9 +121,7 @@ module.exports = function(Chart) {
 
 		calculateBarBase: function(datasetIndex, index) {
 			var meta = this.getMeta();
-			var xScale = this.getScaleForId(meta.xAxisID);
 			var yScale = this.getScaleForId(meta.yAxisID);
-
 			var base = 0;
 
 			if (yScale.options.stacked) {
@@ -163,24 +150,12 @@ module.exports = function(Chart) {
 				return yScale.getPixelForValue(base);
 			}
 
-			base = yScale.getPixelForValue(yScale.min);
-
-			if (yScale.beginAtZero || ((yScale.min <= 0 && yScale.max >= 0) || (yScale.min >= 0 && yScale.max <= 0))) {
-				base = yScale.getPixelForValue(0, 0);
-				//base += yScale.options.gridLines.lineWidth;
-			} else if (yScale.min < 0 && yScale.max < 0) {
-				// All values are negative. Use the top as the base
-				base = yScale.getPixelForValue(yScale.max);
-			}
-
-			return base;
-
+			return yScale.getBasePixel();
 		},
 
 		getRuler: function(index) {
 			var meta = this.getMeta();
 			var xScale = this.getScaleForId(meta.xAxisID);
-			var yScale = this.getScaleForId(meta.yAxisID);
 			var datasetCount = this.getBarCount();
 
 			var tickWidth;
@@ -237,7 +212,6 @@ module.exports = function(Chart) {
 
 		calculateBarX: function(index, datasetIndex) {
 			var meta = this.getMeta();
-			var yScale = this.getScaleForId(meta.yAxisID);
 			var xScale = this.getScaleForId(meta.xAxisID);
 			var barIndex = this.getBarIndex(datasetIndex);
 
@@ -259,9 +233,7 @@ module.exports = function(Chart) {
 
 		calculateBarY: function(index, datasetIndex) {
 			var meta = this.getMeta();
-			var xScale = this.getScaleForId(meta.xAxisID);
 			var yScale = this.getScaleForId(meta.yAxisID);
-
 			var value = this.getDataset().data[index];
 
 			if (yScale.options.stacked) {
@@ -387,21 +359,11 @@ module.exports = function(Chart) {
 			var meta = this.getMeta();
 			var xScale = this.getScaleForId(meta.xAxisID);
 			var yScale = this.getScaleForId(meta.yAxisID);
-
-			var xScalePoint;
-
-			if (xScale.min < 0 && xScale.max < 0) {
-				// all less than 0. use the right
-				xScalePoint = xScale.getPixelForValue(xScale.max);
-			} else if (xScale.min > 0 && xScale.max > 0) {
-				xScalePoint = xScale.getPixelForValue(xScale.min);
-			} else {
-				xScalePoint = xScale.getPixelForValue(0);
-			}
-
+			var scaleBase = xScale.getBasePixel();
 			var custom = rectangle.custom || {};
 			var dataset = this.getDataset();
 			var rectangleElementOptions = this.chart.options.elements.rectangle;
+
 			helpers.extend(rectangle, {
 				// Utility
 				_chart: this.chart.chart,
@@ -412,7 +374,7 @@ module.exports = function(Chart) {
 
 				// Desired view properties
 				_model: {
-					x: reset ? xScalePoint : this.calculateBarX(index, this.index),
+					x: reset ? scaleBase : this.calculateBarX(index, this.index),
 					y: this.calculateBarY(index, this.index),
 
 					// Tooltip
@@ -420,7 +382,7 @@ module.exports = function(Chart) {
 					datasetLabel: dataset.label,
 
 					// Appearance
-					base: reset ? xScalePoint : this.calculateBarBase(this.index, index),
+					base: reset ? scaleBase : this.calculateBarBase(this.index, index),
 					height: this.calculateBarHeight(index),
 					backgroundColor: custom.backgroundColor ? custom.backgroundColor : helpers.getValueAtIndexOrDefault(dataset.backgroundColor, index, rectangleElementOptions.backgroundColor),
 					borderSkipped: custom.borderSkipped ? custom.borderSkipped : rectangleElementOptions.borderSkipped,
@@ -506,8 +468,6 @@ module.exports = function(Chart) {
 		calculateBarBase: function (datasetIndex, index) {
 			var meta = this.getMeta();
 			var xScale = this.getScaleForId(meta.xAxisID);
-			var yScale = this.getScaleForId(meta.yAxisID);
-
 			var base = 0;
 
 			if (xScale.options.stacked) {
@@ -535,21 +495,11 @@ module.exports = function(Chart) {
 				return xScale.getPixelForValue(base);
 			}
 
-			base = xScale.getPixelForValue(xScale.min);
-
-			if (xScale.beginAtZero || ((xScale.min <= 0 && xScale.max >= 0) || (xScale.min >= 0 && xScale.max <= 0))) {
-				base = xScale.getPixelForValue(0, 0);
-			} else if (xScale.min < 0 && xScale.max < 0) {
-				// All values are negative. Use the right as the base
-				base = xScale.getPixelForValue(xScale.max);
-			}
-
-			return base;
+			return xScale.getBasePixel();
 		},
 
 		getRuler: function (index) {
 			var meta = this.getMeta();
-			var xScale = this.getScaleForId(meta.xAxisID);
 			var yScale = this.getScaleForId(meta.yAxisID);
 			var datasetCount = this.getBarCount();
 
@@ -592,8 +542,6 @@ module.exports = function(Chart) {
 		calculateBarX: function (index, datasetIndex) {
 			var meta = this.getMeta();
 			var xScale = this.getScaleForId(meta.xAxisID);
-			var yScale = this.getScaleForId(meta.yAxisID);
-
 			var value = this.getDataset().data[index];
 
 			if (xScale.options.stacked) {
@@ -626,7 +574,6 @@ module.exports = function(Chart) {
 		calculateBarY: function (index, datasetIndex) {
 			var meta = this.getMeta();
 			var yScale = this.getScaleForId(meta.yAxisID);
-			var xScale = this.getScaleForId(meta.xAxisID);
 			var barIndex = this.getBarIndex(datasetIndex);
 
 			var ruler = this.getRuler(index);
diff --git a/src/controllers/controller.bubble.js b/src/controllers/controller.bubble.js
index 581287bd5..1faa10f65 100644
--- a/src/controllers/controller.bubble.js
+++ b/src/controllers/controller.bubble.js
@@ -64,17 +64,6 @@ module.exports = function(Chart) {
 		update: function update(reset) {
 			var meta = this.getMeta();
 			var points = meta.data;
-			var yScale = this.getScaleForId(meta.yAxisID);
-			var xScale = this.getScaleForId(meta.xAxisID);
-			var scaleBase;
-
-			if (yScale.min < 0 && yScale.max < 0) {
-				scaleBase = yScale.getPixelForValue(yScale.max);
-			} else if (yScale.min > 0 && yScale.max > 0) {
-				scaleBase = yScale.getPixelForValue(yScale.min);
-			} else {
-				scaleBase = yScale.getPixelForValue(0);
-			}
 
 			// Update Points
 			helpers.each(points, function(point, index) {
@@ -85,23 +74,14 @@ module.exports = function(Chart) {
 
 		updateElement: function(point, index, reset) {
 			var meta = this.getMeta();
-			var yScale = this.getScaleForId(meta.yAxisID);
 			var xScale = this.getScaleForId(meta.xAxisID);
-			var scaleBase;
+			var yScale = this.getScaleForId(meta.yAxisID);
 
 			var custom = point.custom || {};
 			var dataset = this.getDataset();
 			var data = dataset.data[index];
 			var pointElementOptions = this.chart.options.elements.point;
 
-			if (yScale.min < 0 && yScale.max < 0) {
-				scaleBase = yScale.getPixelForValue(yScale.max);
-			} else if (yScale.min > 0 && yScale.max > 0) {
-				scaleBase = yScale.getPixelForValue(yScale.min);
-			} else {
-				scaleBase = yScale.getPixelForValue(0);
-			}
-
 			helpers.extend(point, {
 				// Utility
 				_chart: this.chart.chart,
@@ -113,7 +93,7 @@ module.exports = function(Chart) {
 				// Desired view properties
 				_model: {
 					x: reset ? xScale.getPixelForDecimal(0.5) : xScale.getPixelForValue(data, index, this.index, this.chart.isCombo),
-					y: reset ? scaleBase : yScale.getPixelForValue(data, index, this.index),
+					y: reset ? yScale.getBasePixel() : yScale.getPixelForValue(data, index, this.index),
 					// Appearance
 					radius: reset ? 0 : custom.radius ? custom.radius : this.getRadius(data),
 					backgroundColor: custom.backgroundColor ? custom.backgroundColor : helpers.getValueAtIndexOrDefault(dataset.backgroundColor, index, pointElementOptions.backgroundColor),
diff --git a/src/controllers/controller.line.js b/src/controllers/controller.line.js
index 080760068..39d0fca28 100644
--- a/src/controllers/controller.line.js
+++ b/src/controllers/controller.line.js
@@ -72,17 +72,8 @@ module.exports = function(Chart) {
 			var points = meta.data || [];
 			var options = me.chart.options;
 			var lineElementOptions = options.elements.line;
-			var yScale = me.getScaleForId(meta.yAxisID);
-			var xScale = me.getScaleForId(meta.xAxisID);
-			var scaleBase, i, ilen, dataset, custom;
-
-			if (yScale.min < 0 && yScale.max < 0) {
-				scaleBase = yScale.getPixelForValue(yScale.max);
-			} else if (yScale.min > 0 && yScale.max > 0) {
-				scaleBase = yScale.getPixelForValue(yScale.min);
-			} else {
-				scaleBase = yScale.getPixelForValue(0);
-			}
+			var scale = me.getScaleForId(meta.yAxisID);
+			var i, ilen, dataset, custom;
 
 			// Update Line
 			if (options.showLines) {
@@ -95,7 +86,7 @@ module.exports = function(Chart) {
 				}
 
 				// Utility
-				line._scale = yScale;
+				line._scale = scale;
 				line._datasetIndex = me.index;
 				// Data
 				line._children = points;
@@ -112,9 +103,9 @@ module.exports = function(Chart) {
 					borderJoinStyle: custom.borderJoinStyle ? custom.borderJoinStyle : (dataset.borderJoinStyle || lineElementOptions.borderJoinStyle),
 					fill: custom.fill ? custom.fill : (dataset.fill !== undefined ? dataset.fill : lineElementOptions.fill),
 					// Scale
-					scaleTop: yScale.top,
-					scaleBottom: yScale.bottom,
-					scaleZero: scaleBase
+					scaleTop: scale.top,
+					scaleBottom: scale.bottom,
+					scaleZero: scale.getBasePixel()
 				};
 
 				line.pivot();
@@ -188,15 +179,7 @@ module.exports = function(Chart) {
 			var yScale = me.getScaleForId(meta.yAxisID);
 			var xScale = me.getScaleForId(meta.xAxisID);
 			var pointOptions = me.chart.options.elements.point;
-			var scaleBase, x, y;
-
-			if (yScale.min < 0 && yScale.max < 0) {
-				scaleBase = yScale.getPixelForValue(yScale.max);
-			} else if (yScale.min > 0 && yScale.max > 0) {
-				scaleBase = yScale.getPixelForValue(yScale.min);
-			} else {
-				scaleBase = yScale.getPixelForValue(0);
-			}
+			var x, y;
 
 			// Compatibility: If the properties are defined with only the old name, use those values
 			if ((dataset.radius !== undefined) && (dataset.pointRadius === undefined)) {
@@ -207,7 +190,7 @@ module.exports = function(Chart) {
 			}
 
 			x = xScale.getPixelForValue(value, index, datasetIndex, me.chart.isCombo);
-			y = reset ? scaleBase : me.calculatePointY(value, index, datasetIndex, me.chart.isCombo);
+			y = reset ? yScale.getBasePixel() : me.calculatePointY(value, index, datasetIndex, me.chart.isCombo);
 
 			// Utility
 			point._chart = me.chart.chart;
@@ -237,7 +220,6 @@ module.exports = function(Chart) {
 			var me = this;
 			var chart = me.chart;
 			var meta = me.getMeta();
-			var xScale = me.getScaleForId(meta.xAxisID);
 			var yScale = me.getScaleForId(meta.yAxisID);
 			var sumPos = 0;
 			var sumNeg = 0;
diff --git a/src/controllers/controller.radar.js b/src/controllers/controller.radar.js
index f4a3f1e4b..4e1a5c48d 100644
--- a/src/controllers/controller.radar.js
+++ b/src/controllers/controller.radar.js
@@ -65,21 +65,10 @@ module.exports = function(Chart) {
 			var custom = line.custom || {};
 			var dataset = this.getDataset();
 			var lineElementOptions = this.chart.options.elements.line;
-
 			var scale = this.chart.scale;
-			var scaleBase;
-
-			if (scale.min < 0 && scale.max < 0) {
-				scaleBase = scale.getPointPositionForValue(0, scale.max);
-			} else if (scale.min > 0 && scale.max > 0) {
-				scaleBase = scale.getPointPositionForValue(0, scale.min);
-			} else {
-				scaleBase = scale.getPointPositionForValue(0, 0);
-			}
 
 			// Compatibility: If the properties are defined with only the old name, use those values
-			if ((dataset.tension !== undefined) && (dataset.lineTension === undefined))
-			{
+			if ((dataset.tension !== undefined) && (dataset.lineTension === undefined)) {
 				dataset.lineTension = dataset.tension;
 			}
 
@@ -104,7 +93,7 @@ module.exports = function(Chart) {
 					// Scale
 					scaleTop: scale.top,
 					scaleBottom: scale.bottom,
-					scaleZero: scaleBase
+					scaleZero: scale.getBasePosition()
 				}
 			});
 
diff --git a/src/core/core.scale.js b/src/core/core.scale.js
index a158be624..cf6afb0f3 100644
--- a/src/core/core.scale.js
+++ b/src/core/core.scale.js
@@ -451,6 +451,18 @@ module.exports = function(Chart) {
 			}
 		},
 
+		getBasePixel: function() {
+			var me = this;
+			var min = me.min;
+			var max = me.max;
+
+			return me.getPixelForValue(
+				me.beginAtZero? 0:
+				min < 0 && max < 0? max :
+				min > 0 && max > 0? min :
+				0);
+		},
+
 		// Actualy draw the scale on the canvas
 		// @param {rectangle} chartArea : the area of the chart to draw full grid lines on
 		draw: function(chartArea) {
diff --git a/src/scales/scale.radialLinear.js b/src/scales/scale.radialLinear.js
index 5d46f26ee..017c0c747 100644
--- a/src/scales/scale.radialLinear.js
+++ b/src/scales/scale.radialLinear.js
@@ -321,6 +321,19 @@ module.exports = function(Chart) {
 		getPointPositionForValue: function(index, value) {
 			return this.getPointPosition(index, this.getDistanceFromCenterForValue(value));
 		},
+
+		getBasePosition: function() {
+			var me = this;
+			var min = me.min;
+			var max = me.max;
+
+			return me.getPointPositionForValue(0,
+				me.beginAtZero? 0:
+				min < 0 && max < 0? max :
+				min > 0 && max > 0? min :
+				0);
+		},
+
 		draw: function() {
 			if (this.options.display) {
 				var ctx = this.ctx;

From 7108f78d2ff0f9d957add630259ae45f924bb614 Mon Sep 17 00:00:00 2001
From: Simon Brunel <simonbrunel@users.noreply.github.com>
Date: Fri, 20 May 2016 23:42:24 +0200
Subject: [PATCH 04/10] Refactor addElements and addElementAndReset

Data controllers should now rarely implement addElements and addElementAndReset but instead should define dataElementType (and optionally datasetElementType). Also remove some dead code (e.g. numBars, colorForNewElement, etc.).
---
 src/chart.js                            | 22 +++++----
 src/controllers/controller.bar.js       | 38 +++------------
 src/controllers/controller.bubble.js    | 35 +-------------
 src/controllers/controller.doughnut.js  | 36 ++------------
 src/controllers/controller.line.js      | 31 ++----------
 src/controllers/controller.polarArea.js | 30 ++----------
 src/controllers/controller.radar.js     | 39 +++------------
 src/core/core.datasetController.js      | 64 +++++++++++++++++++++++--
 8 files changed, 93 insertions(+), 202 deletions(-)

diff --git a/src/chart.js b/src/chart.js
index 6c2d8c51b..58061c2ab 100644
--- a/src/chart.js
+++ b/src/chart.js
@@ -13,12 +13,10 @@ require('./core/core.scaleService')(Chart);
 require('./core/core.title')(Chart);
 require('./core/core.tooltip')(Chart);
 
-require('./controllers/controller.bar')(Chart);
-require('./controllers/controller.bubble')(Chart);
-require('./controllers/controller.doughnut')(Chart);
-require('./controllers/controller.line')(Chart);
-require('./controllers/controller.polarArea')(Chart);
-require('./controllers/controller.radar')(Chart);
+require('./elements/element.arc')(Chart);
+require('./elements/element.line')(Chart);
+require('./elements/element.point')(Chart);
+require('./elements/element.rectangle')(Chart);
 
 require('./scales/scale.category')(Chart);
 require('./scales/scale.linear')(Chart);
@@ -26,10 +24,14 @@ require('./scales/scale.logarithmic')(Chart);
 require('./scales/scale.radialLinear')(Chart);
 require('./scales/scale.time')(Chart);
 
-require('./elements/element.arc')(Chart);
-require('./elements/element.line')(Chart);
-require('./elements/element.point')(Chart);
-require('./elements/element.rectangle')(Chart);
+// Controllers must be loaded after elements
+// See Chart.core.datasetController.dataElementType
+require('./controllers/controller.bar')(Chart);
+require('./controllers/controller.bubble')(Chart);
+require('./controllers/controller.doughnut')(Chart);
+require('./controllers/controller.line')(Chart);
+require('./controllers/controller.polarArea')(Chart);
+require('./controllers/controller.radar')(Chart);
 
 require('./charts/Chart.Bar')(Chart);
 require('./charts/Chart.Bubble')(Chart);
diff --git a/src/controllers/controller.bar.js b/src/controllers/controller.bar.js
index 7a6915cf6..11cb32447 100644
--- a/src/controllers/controller.bar.js
+++ b/src/controllers/controller.bar.js
@@ -29,12 +29,16 @@ module.exports = function(Chart) {
 	};
 
 	Chart.controllers.bar = Chart.DatasetController.extend({
+
+		dataElementType: Chart.elements.Rectangle,
+
 		initialize: function(chart, datasetIndex) {
 			Chart.DatasetController.prototype.initialize.call(this, chart, datasetIndex);
 
 			// Use this to indicate that this is a bar dataset.
 			this.getMeta().bar = true;
 		},
+
 		// Get the number of datasets that display bars. We use this to correctly calculate the bar width
 		getBarCount: function getBarCount() {
 			var barCount = 0;
@@ -47,40 +51,13 @@ module.exports = function(Chart) {
 			return barCount;
 		},
 
-		addElements: function() {
-			var meta = this.getMeta();
-			helpers.each(this.getDataset().data, function(value, index) {
-				meta.data[index] = meta.data[index] || new Chart.elements.Rectangle({
-					_chart: this.chart.chart,
-					_datasetIndex: this.index,
-					_index: index
-				});
-			}, this);
-		},
-
-		addElementAndReset: function(index) {
-			var rectangle = new Chart.elements.Rectangle({
-				_chart: this.chart.chart,
-				_datasetIndex: this.index,
-				_index: index
-			});
-
-			var numBars = this.getBarCount();
-
-			// Add to the points array and reset it
-			this.getMeta().data.splice(index, 0, rectangle);
-			this.updateElement(rectangle, index, true, numBars);
-		},
-
 		update: function update(reset) {
-			var numBars = this.getBarCount();
-
 			helpers.each(this.getMeta().data, function(rectangle, index) {
-				this.updateElement(rectangle, index, reset, numBars);
+				this.updateElement(rectangle, index, reset);
 			}, this);
 		},
 
-		updateElement: function updateElement(rectangle, index, reset, numBars) {
+		updateElement: function updateElement(rectangle, index, reset) {
 			var meta = this.getMeta();
 			var xScale = this.getScaleForId(meta.xAxisID);
 			var yScale = this.getScaleForId(meta.yAxisID);
@@ -91,13 +68,11 @@ module.exports = function(Chart) {
 
 			helpers.extend(rectangle, {
 				// Utility
-				_chart: this.chart.chart,
 				_xScale: xScale,
 				_yScale: yScale,
 				_datasetIndex: this.index,
 				_index: index,
 
-
 				// Desired view properties
 				_model: {
 					x: this.calculateBarX(index, this.index),
@@ -366,7 +341,6 @@ module.exports = function(Chart) {
 
 			helpers.extend(rectangle, {
 				// Utility
-				_chart: this.chart.chart,
 				_xScale: xScale,
 				_yScale: yScale,
 				_datasetIndex: this.index,
diff --git a/src/controllers/controller.bubble.js b/src/controllers/controller.bubble.js
index 1faa10f65..d0f949101 100644
--- a/src/controllers/controller.bubble.js
+++ b/src/controllers/controller.bubble.js
@@ -37,29 +37,9 @@ module.exports = function(Chart) {
 		}
 	};
 
-
 	Chart.controllers.bubble = Chart.DatasetController.extend({
-		addElements: function() {
-			var meta = this.getMeta();
-			helpers.each(this.getDataset().data, function(value, index) {
-				meta.data[index] = meta.data[index] || new Chart.elements.Point({
-					_chart: this.chart.chart,
-					_datasetIndex: this.index,
-					_index: index
-				});
-			}, this);
-		},
-		addElementAndReset: function(index) {
-			var point = new Chart.elements.Point({
-				_chart: this.chart.chart,
-				_datasetIndex: this.index,
-				_index: index
-			});
 
-			// Add to the points array and reset it
-			this.getMeta().data.splice(index, 0, point);
-			this.updateElement(point, index, true);
-		},
+		dataElementType: Chart.elements.Point,
 
 		update: function update(reset) {
 			var meta = this.getMeta();
@@ -69,7 +49,6 @@ module.exports = function(Chart) {
 			helpers.each(points, function(point, index) {
 				this.updateElement(point, index, reset);
 			}, this);
-
 		},
 
 		updateElement: function(point, index, reset) {
@@ -84,7 +63,6 @@ module.exports = function(Chart) {
 
 			helpers.extend(point, {
 				// Utility
-				_chart: this.chart.chart,
 				_xScale: xScale,
 				_yScale: yScale,
 				_datasetIndex: this.index,
@@ -115,17 +93,6 @@ module.exports = function(Chart) {
 			return value.r || this.chart.options.elements.point.radius;
 		},
 
-		draw: function(ease) {
-			var easingDecimal = ease || 1;
-
-			// Transition and Draw the Points
-			helpers.each(this.getMeta().data, function(point, index) {
-				point.transition(easingDecimal);
-				point.draw();
-			});
-
-		},
-
 		setHoverStyle: function(point) {
 			// Point
 			var dataset = this.chart.data.datasets[point._datasetIndex];
diff --git a/src/controllers/controller.doughnut.js b/src/controllers/controller.doughnut.js
index 00152fb00..9f7cd2f2c 100644
--- a/src/controllers/controller.doughnut.js
+++ b/src/controllers/controller.doughnut.js
@@ -113,40 +113,11 @@ module.exports = function(Chart) {
 
 
 	Chart.controllers.doughnut = Chart.controllers.pie = Chart.DatasetController.extend({
-		// no scales for doughnut
+
+		dataElementType: Chart.elements.Arc,
+
 		linkScales: helpers.noop,
 
-		addElements: function() {
-			var _this = this;
-			var meta = this.getMeta(),
-				data = meta.data;
-			helpers.each(_this.getDataset().data, function(value, index) {
-				data[index] = data[index] || new Chart.elements.Arc({
-					_chart: _this.chart.chart,
-					_datasetIndex: _this.index,
-					_index: index
-				});
-			});
-		},
-
-		addElementAndReset: function(index, colorForNewElement) {
-			var _this = this;
-			var arc = new Chart.elements.Arc({
-				_chart: _this.chart.chart,
-				_datasetIndex: _this.index,
-				_index: index
-			}),
-			ds = _this.getDataset();
-
-			if (colorForNewElement && helpers.isArray(ds.backgroundColor)) {
-				ds.backgroundColor.splice(index, 0, colorForNewElement);
-			}
-
-			// Add to the points array and reset it
-			_this.getMeta().data.splice(index, 0, arc);
-			_this.updateElement(arc, index, true);
-		},
-
 		// Get index of the dataset in relation to the visible datasets. This allows determining the inner and outer radius correctly
 		getRingIndex: function getRingIndex(datasetIndex) {
 			var ringIndex = 0;
@@ -232,7 +203,6 @@ module.exports = function(Chart) {
 
 			helpers.extend(arc, {
 				// Utility
-				_chart: chart.chart,
 				_datasetIndex: _this.index,
 				_index: index,
 
diff --git a/src/controllers/controller.line.js b/src/controllers/controller.line.js
index 39d0fca28..4c692d5ab 100644
--- a/src/controllers/controller.line.js
+++ b/src/controllers/controller.line.js
@@ -24,40 +24,16 @@ module.exports = function(Chart) {
 	};
 
 	Chart.controllers.line = Chart.DatasetController.extend({
-		addElements: function() {
-			var me = this;
-			var meta = me.getMeta();
-			var data = me.getDataset().data || [];
-			var value, i, ilen;
 
-			meta.dataset = meta.dataset || new Chart.elements.Line({
-				_chart: me.chart.chart,
-				_datasetIndex: me.index,
-				_points: meta.data
-			});
+		datasetElementType: Chart.elements.Line,
 
-			for (i=0, ilen=data.length; i<ilen; ++i) {
-				value = data[i];
-				meta.data[i] = meta.data[i] || new Chart.elements.Point({
-					_chart: me.chart.chart,
-					_datasetIndex: me.index,
-					_index: i
-				});
-			}
-		},
+		dataElementType: Chart.elements.Point,
 
 		addElementAndReset: function(index) {
 			var me = this;
 			var options = me.chart.options;
-			var point = new Chart.elements.Point({
-				_chart: me.chart.chart,
-				_datasetIndex: me.index,
-				_index: index
-			});
 
-			// Add to the points array and reset it
-			me.getMeta().data.splice(index, 0, point);
-			me.updateElement(point, index, true);
+			Chart.DatasetController.prototype.addElementAndReset.call(me, index);
 
 			// Make sure bezier control points are updated
 			if (options.showLines && options.elements.line.tension !== 0) {
@@ -193,7 +169,6 @@ module.exports = function(Chart) {
 			y = reset ? yScale.getBasePixel() : me.calculatePointY(value, index, datasetIndex, me.chart.isCombo);
 
 			// Utility
-			point._chart = me.chart.chart;
 			point._xScale = xScale;
 			point._yScale = yScale;
 			point._datasetIndex = datasetIndex;
diff --git a/src/controllers/controller.polarArea.js b/src/controllers/controller.polarArea.js
index 1523cfb1d..372ede3f3 100644
--- a/src/controllers/controller.polarArea.js
+++ b/src/controllers/controller.polarArea.js
@@ -100,34 +100,11 @@ module.exports = function(Chart) {
 	};
 
 	Chart.controllers.polarArea = Chart.DatasetController.extend({
+
+		dataElementType: Chart.elements.Arc,
+
 		linkScales: helpers.noop,
 
-		addElements: function() {
-			var _this = this;
-			var meta = this.getMeta();
-			var data = meta.data;
-			helpers.each(_this.getDataset().data, function(value, index) {
-				data[index] = data[index] || new Chart.elements.Arc({
-					_chart: _this.chart.chart,
-					_datasetIndex: _this.index,
-					_index: index
-				});
-			});
-		},
-
-		addElementAndReset: function(index) {
-			var _this = this;
-			var arc = new Chart.elements.Arc({
-				_chart: _this.chart.chart,
-				_datasetIndex: _this.index,
-				_index: index
-			});
-
-			// Add to the points array and reset it
-			_this.getMeta().data.splice(index, 0, arc);
-			_this.updateElement(arc, index, true);
-		},
-
 		update: function update(reset) {
 			var _this = this;
 			var chart = _this.chart;
@@ -198,7 +175,6 @@ module.exports = function(Chart) {
 
 			helpers.extend(arc, {
 				// Utility
-				_chart: chart.chart,
 				_datasetIndex: _this.index,
 				_index: index,
 				_scale: scale,
diff --git a/src/controllers/controller.radar.js b/src/controllers/controller.radar.js
index 4e1a5c48d..6dcd976ce 100644
--- a/src/controllers/controller.radar.js
+++ b/src/controllers/controller.radar.js
@@ -4,7 +4,6 @@ module.exports = function(Chart) {
 
 	var helpers = Chart.helpers;
 
-
 	Chart.defaults.radar = {
 		scale: {
 			type: "radialLinear"
@@ -17,42 +16,15 @@ module.exports = function(Chart) {
 	};
 
 	Chart.controllers.radar = Chart.DatasetController.extend({
-		linkScales: function() {
-			// No need. Single scale only
-		},
 
-		addElements: function() {
-			var meta = this.getMeta();
+		datasetElementType: Chart.elements.Line,
 
-			meta.dataset = meta.dataset || new Chart.elements.Line({
-				_chart: this.chart.chart,
-				_datasetIndex: this.index,
-				_points: meta.data,
-				_loop: true
-			});
+		dataElementType: Chart.elements.Point,
+
+		linkScales: helpers.noop,
 
-			helpers.each(this.getDataset().data, function(value, index) {
-				meta.data[index] = meta.data[index] || new Chart.elements.Point({
-					_chart: this.chart.chart,
-					_datasetIndex: this.index,
-					_index: index,
-					_model: {
-						x: 0, //xScale.getPixelForValue(null, index, true),
-						y: 0 //this.chartArea.bottom,
-					}
-				});
-			}, this);
-		},
 		addElementAndReset: function(index) {
-			var point = new Chart.elements.Point({
-				_chart: this.chart.chart,
-				_datasetIndex: this.index,
-				_index: index
-			});
-
-			// Add to the points array and reset it
-			this.getMeta().data.splice(index, 0, point);
-			this.updateElement(point, index, true);
+			Chart.DatasetController.prototype.addElementAndReset.call(this, index);
 
 			// Make sure bezier control points are updated
 			this.updateBezierControlPoints();
@@ -77,6 +49,7 @@ module.exports = function(Chart) {
 				_datasetIndex: this.index,
 				// Data
 				_children: points,
+				_loop: true,
 				// Model
 				_model: {
 					// Appearance
diff --git a/src/core/core.datasetController.js b/src/core/core.datasetController.js
index 835d0858f..f4d213eca 100644
--- a/src/core/core.datasetController.js
+++ b/src/core/core.datasetController.js
@@ -11,12 +11,26 @@ module.exports = function(Chart) {
 	};
 
 	helpers.extend(Chart.DatasetController.prototype, {
+
+		/**
+		 * Element type used to generate a meta dataset (e.g. Chart.element.Line).
+		 * @type {Chart.core.element}
+		 */
+		datasetElementType: null,
+
+		/**
+		 * Element type used to generate a meta data (e.g. Chart.element.Point).
+		 * @type {Chart.core.element}
+		 */
+		dataElementType: null,
+
 		initialize: function(chart, datasetIndex) {
 			this.chart = chart;
 			this.index = datasetIndex;
 			this.linkScales();
 			this.addElements();
 		},
+
 		updateIndex: function(datasetIndex) {
 			this.index = datasetIndex;
 		},
@@ -49,6 +63,46 @@ module.exports = function(Chart) {
 			this.update(true);
 		},
 
+		createMetaDataset: function() {
+			var me = this;
+			var type = me.datasetElementType;
+			return type && new type({
+				_chart: me.chart.chart,
+				_datasetIndex: me.index
+			});
+		},
+
+		createMetaData: function(index) {
+			var me = this;
+			var type = me.dataElementType;
+			return type && new type({
+				_chart: me.chart.chart,
+				_datasetIndex: me.index,
+				_index: index
+			});
+		},
+
+		addElements: function() {
+			var me = this;
+			var meta = me.getMeta();
+			var data = me.getDataset().data || [];
+			var metaData = meta.data;
+			var i, ilen;
+
+			for (i=0, ilen=data.length; i<ilen; ++i) {
+				metaData[i] = metaData[i] || me.createMetaData(meta, i);
+			}
+
+			meta.dataset = meta.dataset || me.createMetaDataset();
+		},
+
+		addElementAndReset: function(index) {
+			var me = this;
+			var element = me.createMetaData(index);
+			me.getMeta().data.splice(index, 0, element);
+			me.updateElement(element, index, true);
+		},
+
 		buildOrUpdateElements: function buildOrUpdateElements() {
 			// Handle the number of data points changing
 			var meta = this.getMeta(),
@@ -68,15 +122,15 @@ module.exports = function(Chart) {
 			}
 		},
 
-		// Controllers should implement the following
-		addElements: noop,
-		addElementAndReset: noop,
+		update: 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,
@@ -89,6 +143,7 @@ module.exports = function(Chart) {
 			model.borderColor = custom.borderColor ? custom.borderColor : valueOrDefault(dataset.borderColor, index, elementOpts.borderColor);
 			model.borderWidth = custom.borderWidth ? custom.borderWidth : valueOrDefault(dataset.borderWidth, index, elementOpts.borderWidth);
 		},
+
 		setHoverStyle: function(element) {
 			var dataset = this.chart.data.datasets[element._datasetIndex],
 				index = element._index,
@@ -101,8 +156,7 @@ module.exports = function(Chart) {
 			model.backgroundColor = custom.hoverBackgroundColor ? custom.hoverBackgroundColor : valueOrDefault(dataset.hoverBackgroundColor, index, getHoverColor(model.backgroundColor));
 			model.borderColor = custom.hoverBorderColor ? custom.hoverBorderColor : valueOrDefault(dataset.hoverBorderColor, index, getHoverColor(model.borderColor));
 			model.borderWidth = custom.hoverBorderWidth ? custom.hoverBorderWidth : valueOrDefault(dataset.hoverBorderWidth, index, model.borderWidth);
-		},
-		update: noop
+		}
 	});
 
 	Chart.DatasetController.extend = helpers.inherits;

From d584afb5434d8a3cfbc0df856b88792dd2738037 Mon Sep 17 00:00:00 2001
From: Simon Brunel <simonbrunel@users.noreply.github.com>
Date: Sat, 21 May 2016 22:53:58 +0200
Subject: [PATCH 05/10] Refactor controller scale methods

Rewrite these two methods to reduce code duplication. Note that options.scale is not anymore mapped to 'radialScale' ID but to 'scale' ID (see ensureScalesHaveIDs), since this ID is not referenced anywhere in the code base.
---
 src/core/core.controller.js | 119 ++++++++++++++++--------------------
 1 file changed, 54 insertions(+), 65 deletions(-)

diff --git a/src/core/core.controller.js b/src/core/core.controller.js
index 439cce27d..aa60acc0b 100644
--- a/src/core/core.controller.js
+++ b/src/core/core.controller.js
@@ -98,82 +98,71 @@ module.exports = function(Chart) {
 
 			return this;
 		},
+
 		ensureScalesHaveIDs: function ensureScalesHaveIDs() {
-			var defaultXAxisID = 'x-axis-';
-			var defaultYAxisID = 'y-axis-';
+			var options = this.options;
+			var scalesOptions = options.scales || {};
+			var scaleOptions = options.scale;
 
-			if (this.options.scales) {
-				if (this.options.scales.xAxes && this.options.scales.xAxes.length) {
-					helpers.each(this.options.scales.xAxes, function(xAxisOptions, index) {
-						xAxisOptions.id = xAxisOptions.id || (defaultXAxisID + index);
-					});
-				}
+			helpers.each(scalesOptions.xAxes, function(xAxisOptions, index) {
+				xAxisOptions.id = xAxisOptions.id || ('x-axis-' + index);
+			});
 
-				if (this.options.scales.yAxes && this.options.scales.yAxes.length) {
-					// Build the y axes
-					helpers.each(this.options.scales.yAxes, function(yAxisOptions, index) {
-						yAxisOptions.id = yAxisOptions.id || (defaultYAxisID + index);
-					});
-				}
+			helpers.each(scalesOptions.yAxes, function(yAxisOptions, index) {
+				yAxisOptions.id = yAxisOptions.id || ('y-axis-' + index);
+			});
+
+			if (scaleOptions) {
+				scaleOptions.id = scaleOptions.id || 'scale';
 			}
 		},
+
+		/**
+		 * Builds a map of scale ID to scale object for future lookup.
+		 */
 		buildScales: function buildScales() {
-			// Map of scale ID to scale object so we can lookup later
-			this.scales = {};
+			var me = this;
+			var options = me.options;
+			var scales = me.scales = {};
+			var items = [];
 
-			// Build the x axes
-			if (this.options.scales) {
-				if (this.options.scales.xAxes && this.options.scales.xAxes.length) {
-					helpers.each(this.options.scales.xAxes, function(xAxisOptions, index) {
-						var xType = helpers.getValueOrDefault(xAxisOptions.type, 'category');
-						var ScaleClass = Chart.scaleService.getScaleConstructor(xType);
-						if (ScaleClass) {
-							var scale = new ScaleClass({
-								ctx: this.chart.ctx,
-								options: xAxisOptions,
-								chart: this,
-								id: xAxisOptions.id
-							});
-
-							this.scales[scale.id] = scale;
-						}
-					}, this);
-				}
-
-				if (this.options.scales.yAxes && this.options.scales.yAxes.length) {
-					// Build the y axes
-					helpers.each(this.options.scales.yAxes, function(yAxisOptions, index) {
-						var yType = helpers.getValueOrDefault(yAxisOptions.type, 'linear');
-						var ScaleClass = Chart.scaleService.getScaleConstructor(yType);
-						if (ScaleClass) {
-							var scale = new ScaleClass({
-								ctx: this.chart.ctx,
-								options: yAxisOptions,
-								chart: this,
-								id: yAxisOptions.id
-							});
-
-							this.scales[scale.id] = scale;
-						}
-					}, this);
-				}
+			if (options.scales) {
+				items = items.concat(
+					(options.scales.xAxes || []).map(function(xAxisOptions) {
+						return { options: xAxisOptions, dtype: 'category' }; }),
+					(options.scales.yAxes || []).map(function(yAxisOptions) {
+						return { options: yAxisOptions, dtype: 'linear' }; }));
 			}
-			if (this.options.scale) {
-				// Build radial axes
-				var ScaleClass = Chart.scaleService.getScaleConstructor(this.options.scale.type);
-				if (ScaleClass) {
-					var scale = new ScaleClass({
-						ctx: this.chart.ctx,
-						options: this.options.scale,
-						chart: this
-					});
 
-					this.scale = scale;
-
-					this.scales.radialScale = scale;
-				}
+			if (options.scale) {
+				items.push({ options: options.scale, dtype: 'radialLinear', isDefault: true });
 			}
 
+			helpers.each(items, function(item, index) {
+				var scaleOptions = item.options;
+				var scaleType = helpers.getValueOrDefault(scaleOptions.type, item.dtype);
+				var scaleClass = Chart.scaleService.getScaleConstructor(scaleType);
+				if (!scaleClass) {
+					return;
+				}
+
+				var scale = new scaleClass({
+					id: scaleOptions.id,
+					options: scaleOptions,
+					ctx: me.chart.ctx,
+					chart: me
+				});
+
+				scales[scale.id] = scale;
+
+				// TODO(SB): I think we should be able to remove this custom case (options.scale)
+				// and consider it as a regular scale part of the "scales"" map only! This would
+				// make the logic easier and remove some useless? custom code.
+				if (item.isDefault) {
+					me.scale = scale;
+				}
+			});
+
 			Chart.scaleService.addScalesToLayout(this);
 		},
 

From 7f71990a40d12c019b5ba341afd42d93e20ebc42 Mon Sep 17 00:00:00 2001
From: Simon Brunel <simonbrunel@users.noreply.github.com>
Date: Sun, 22 May 2016 00:21:59 +0200
Subject: [PATCH 06/10] Decomplexify Chart.core.controller.eventHandler

Refactor redundant code, use local variables and introduce a new helper to compare arrays (Chart.helpers.arrayEquals).
---
 src/core/core.controller.js | 170 ++++++++++++++++--------------------
 src/core/core.helpers.js    |  24 +++++
 2 files changed, 99 insertions(+), 95 deletions(-)

diff --git a/src/core/core.controller.js b/src/core/core.controller.js
index aa60acc0b..36edf9e7a 100644
--- a/src/core/core.controller.js
+++ b/src/core/core.controller.js
@@ -388,6 +388,20 @@ module.exports = function(Chart) {
 			return elementsArray;
 		},
 
+		getElementsAtEventForMode: function(e, mode) {
+			var me = this;
+			switch (mode) {
+			case 'single':
+				return me.getElementAtEvent(e);
+			case 'label':
+				return me.getElementsAtEvent(e);
+			case 'dataset':
+				return me.getDatasetAtEvent(e);
+			default:
+				return e;
+			}
+		},
+
 		getDatasetAtEvent: function(e) {
 			var elementsArray = this.getElementAtEvent(e);
 
@@ -484,140 +498,106 @@ module.exports = function(Chart) {
 				this.eventHandler(evt);
 			});
 		},
+
+		updateHoverStyle: function(elements, mode, enabled) {
+			var method = enabled? 'setHoverStyle' : 'removeHoverStyle';
+			var element, i, ilen;
+
+			switch (mode) {
+			case 'single':
+				elements = [ elements[0] ];
+				break;
+			case 'label':
+			case 'dataset':
+				// elements = elements;
+				break;
+			default:
+				// unsupported mode
+				return;
+			}
+
+			for (i=0, ilen=elements.length; i<ilen; ++i) {
+				element = elements[i];
+				if (element) {
+					this.getDatasetMeta(element._datasetIndex).controller[method](element);
+				}
+			}
+		},
+
 		eventHandler: function eventHandler(e) {
-			this.lastActive = this.lastActive || [];
-			this.lastTooltipActive = this.lastTooltipActive || [];
+			var me = this;
+			var tooltip = me.tooltip;
+			var options = me.options || {};
+			var hoverOptions = options.hover;
+			var tooltipsOptions = options.tooltips;
+
+			me.lastActive = me.lastActive || [];
+			me.lastTooltipActive = me.lastTooltipActive || [];
 
 			// Find Active Elements for hover and tooltips
 			if (e.type === 'mouseout') {
-				this.active = [];
-				this.tooltipActive = [];
+				me.active = [];
+				me.tooltipActive = [];
 			} else {
-
-				var _this = this;
-				var getItemsForMode = function(mode) {
-					switch (mode) {
-						case 'single':
-							return _this.getElementAtEvent(e);
-						case 'label':
-							return _this.getElementsAtEvent(e);
-						case 'dataset':
-							return _this.getDatasetAtEvent(e);
-						default:
-							return e;
-					}
-				};
-
-				this.active = getItemsForMode(this.options.hover.mode);
-				this.tooltipActive = getItemsForMode(this.options.tooltips.mode);
+				me.active = me.getElementsAtEventForMode(e, hoverOptions.mode);
+				me.tooltipActive =  me.getElementsAtEventForMode(e, tooltipsOptions.mode);
 			}
 
 			// On Hover hook
-			if (this.options.hover.onHover) {
-				this.options.hover.onHover.call(this, this.active);
+			if (hoverOptions.onHover) {
+				hoverOptions.onHover.call(me, me.active);
 			}
 
 			if (e.type === 'mouseup' || e.type === 'click') {
-				if (this.options.onClick) {
-					this.options.onClick.call(this, e, this.active);
+				if (options.onClick) {
+					options.onClick.call(me, e, me.active);
 				}
-
-				if (this.legend && this.legend.handleEvent) {
-					this.legend.handleEvent(e);
+				if (me.legend && me.legend.handleEvent) {
+					me.legend.handleEvent(e);
 				}
 			}
 
 			// Remove styling for last active (even if it may still be active)
-			if (this.lastActive.length) {
-				var lastActive;
-				switch (this.options.hover.mode) {
-					case 'single':
-						lastActive = this.lastActive[0];
-						this.getDatasetMeta(lastActive._datasetIndex).controller.removeHoverStyle(lastActive, lastActive._datasetIndex, lastActive._index);
-						break;
-					case 'label':
-					case 'dataset':
-						for (var i = 0; i < this.lastActive.length; i++) {
-							lastActive = this.lastActive[i];
-							if (lastActive)
-								this.getDatasetMeta(lastActive._datasetIndex).controller.removeHoverStyle(lastActive, lastActive._datasetIndex, lastActive._index);
-						}
-						break;
-					default:
-						// Don't change anything
-				}
+			if (me.lastActive.length) {
+				me.updateHoverStyle(me.lastActive, hoverOptions.mode, false);
 			}
 
 			// Built in hover styling
-			if (this.active.length && this.options.hover.mode) {
-				var active;
-				switch (this.options.hover.mode) {
-					case 'single':
-						active = this.active[0];
-						this.getDatasetMeta(active._datasetIndex).controller.setHoverStyle(active);
-						break;
-					case 'label':
-					case 'dataset':
-						for (var j = 0; j < this.active.length; j++) {
-							active = this.active[j];
-							if (active)
-								this.getDatasetMeta(active._datasetIndex).controller.setHoverStyle(active);
-						}
-						break;
-					default:
-						// Don't change anything
-				}
+			if (me.active.length && hoverOptions.mode) {
+				me.updateHoverStyle(me.active, hoverOptions.mode, true);
 			}
 
-			var tooltip = this.tooltip;
 			// Built in Tooltips
-			if (this.options.tooltips.enabled || this.options.tooltips.custom) {
-
-				// The usual updates
+			if (tooltipsOptions.enabled || tooltipsOptions.custom) {
 				tooltip.initialize();
-				tooltip._active = this.tooltipActive;
+				tooltip._active = me.tooltipActive;
 				tooltip.update(true);
 			}
 
 			// Hover animations
 			tooltip.pivot();
 
-			if (!this.animating) {
-				var changed;
-
-				helpers.each(this.active, function(element, index) {
-					if (element !== this.lastActive[index]) {
-						changed = true;
-					}
-				}, this);
-
-				helpers.each(this.tooltipActive, function(element, index) {
-					if (element !== this.lastTooltipActive[index]) {
-						changed = true;
-					}
-				}, this);
-
+			if (!me.animating) {
 				// If entering, leaving, or changing elements, animate the change via pivot
-				if ((this.lastActive.length !== this.active.length) ||
-					(this.lastTooltipActive.length !== this.tooltipActive.length) ||
-					changed) {
+				if (!helpers.arrayEquals(me.active, me.lastActive) ||
+					!helpers.arrayEquals(me.tooltipActive, me.lastTooltipActive)) {
 
-					this.stop();
+					me.stop();
 
-					if (this.options.tooltips.enabled || this.options.tooltips.custom) {
+					if (tooltipsOptions.enabled || tooltipsOptions.custom) {
 						tooltip.update(true);
 					}
 
-					// We only need to render at this point. Updating will cause scales to be recomputed generating flicker & using more
-					// memory than necessary.
-					this.render(this.options.hover.animationDuration, true);
+					// We only need to render at this point. Updating will cause scales to be
+					// recomputed generating flicker & using more memory than necessary.
+					me.render(hoverOptions.animationDuration, true);
 				}
 			}
 
 			// Remember Last Actives
-			this.lastActive = this.active;
-			this.lastTooltipActive = this.tooltipActive;
-			return this;
+			me.lastActive = me.active;
+			me.lastTooltipActive = me.tooltipActive;
+			return me;
 		}
 	});
 };
diff --git a/src/core/core.helpers.js b/src/core/core.helpers.js
index 6ee48d8d9..028ad3156 100644
--- a/src/core/core.helpers.js
+++ b/src/core/core.helpers.js
@@ -925,6 +925,30 @@ module.exports = function(Chart) {
 		}
 		return Array.isArray(obj);
 	};
+	//! @see http://stackoverflow.com/a/14853974
+	helpers.arrayEquals = function(a0, a1) {
+		var i, ilen, v0, v1;
+
+		if (!a0 || !a1 || a0.length != a1.length) {
+			return false;
+		}
+
+		for (i = 0, ilen=a0.length; i < ilen; ++i) {
+			v0 = a0[i];
+			v1 = a1[i];
+
+			if (v0 instanceof Array && v1 instanceof Array) {
+				if (!helpers.arrayEquals(v0, v1)) {
+					return false;
+				}
+			} else if (v0 != v1) {
+				// NOTE: two different object instances will never be equal: {x:20} != {x:20}
+				return false;
+			}
+		}
+
+		return true;
+	};
 	helpers.pushAllIfDefined = function(element, array) {
 		if (typeof element === "undefined") {
 			return;

From cd7b975c95d0dc7b1147148ea305ffe929f34d45 Mon Sep 17 00:00:00 2001
From: Zach Panzarino <zachary@panzarino.com>
Date: Tue, 24 May 2016 13:02:02 +0000
Subject: [PATCH 07/10] Clean up gulpfile

---
 gulpfile.js | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index 7700f6cdb..ab339d58b 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -22,17 +22,16 @@ var gulp = require('gulp'),
 
 var srcDir = './src/';
 var outDir = './dist/';
-var testDir = './test/';
 
-var header = "/*!\n\
- * Chart.js\n\
- * http://chartjs.org/\n\
- * Version: {{ version }}\n\
- *\n\
- * Copyright 2016 Nick Downie\n\
- * Released under the MIT license\n\
- * https://github.com/chartjs/Chart.js/blob/master/LICENSE.md\n\
- */\n";
+var header = "/*!\n" +
+  " * Chart.js\n" +
+  " * http://chartjs.org/\n" +
+  " * Version: {{ version }}\n" +
+  " *\n" +
+  " * Copyright 2016 Nick Downie\n" +
+  " * Released under the MIT license\n" +
+  " * https://github.com/chartjs/Chart.js/blob/master/LICENSE.md\n" +
+  " */\n";
 
 var preTestFiles = [
   './node_modules/moment/min/moment.min.js',
@@ -157,11 +156,15 @@ function validHTMLTask() {
     .pipe(htmlv());
 }
 
-
-function unittestTask() {
+function startTest() {
   var files = ['./src/**/*.js'];
   Array.prototype.unshift.apply(files, preTestFiles);
   Array.prototype.push.apply(files, testFiles);
+  return files;
+}
+
+function unittestTask() {
+  var files = startTest();
 
   return gulp.src(files)
     .pipe(karma({
@@ -171,9 +174,7 @@ function unittestTask() {
 }
 
 function unittestWatchTask() {
-  var files = ['./src/**/*.js'];
-  Array.prototype.unshift.apply(files, preTestFiles);
-  Array.prototype.push.apply(files, testFiles);
+  var files = startTest();
 
   return gulp.src(files)
     .pipe(karma({
@@ -183,9 +184,7 @@ function unittestWatchTask() {
 }
 
 function coverageTask() {
-  var files = ['./src/**/*.js'];
-  Array.prototype.unshift.apply(files, preTestFiles);
-  Array.prototype.push.apply(files, testFiles);
+  var files = startTest();
 
   return gulp.src(files)
     .pipe(karma({

From 050a6cb7c0c879c395aa619a8f27af69715697e7 Mon Sep 17 00:00:00 2001
From: Zach Panzarino <zachary@panzarino.com>
Date: Tue, 24 May 2016 15:04:20 +0000
Subject: [PATCH 08/10] Clean up gulpfile even more

---
 gulpfile.js | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index ab339d58b..d3a03ec8d 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -164,9 +164,7 @@ function startTest() {
 }
 
 function unittestTask() {
-  var files = startTest();
-
-  return gulp.src(files)
+  return gulp.src(startTest())
     .pipe(karma({
       configFile: 'karma.conf.ci.js',
       action: 'run'
@@ -174,9 +172,7 @@ function unittestTask() {
 }
 
 function unittestWatchTask() {
-  var files = startTest();
-
-  return gulp.src(files)
+  return gulp.src(startTest())
     .pipe(karma({
       configFile: 'karma.conf.js',
       action: 'watch'
@@ -184,9 +180,7 @@ function unittestWatchTask() {
 }
 
 function coverageTask() {
-  var files = startTest();
-
-  return gulp.src(files)
+  return gulp.src(startTest())
     .pipe(karma({
       configFile: 'karma.coverage.conf.js',
       action: 'run'

From 02f34f4e92c8947ea30f5ee3fbf13bf628fc569d Mon Sep 17 00:00:00 2001
From: Vanderhoven Nick <you@example.com>
Date: Wed, 25 May 2016 11:03:50 +0200
Subject: [PATCH 09/10] This fixes documentation issue #2628

---
 docs/02-Line-Chart.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/02-Line-Chart.md b/docs/02-Line-Chart.md
index e4895083b..92736614d 100644
--- a/docs/02-Line-Chart.md
+++ b/docs/02-Line-Chart.md
@@ -128,9 +128,11 @@ new Chart(ctx, {
 	type: 'line',
 	data: data,
 	options: {
-		xAxes: [{
-			display: false
-		}]
+		scales: {
+			xAxes: [{
+				display: false
+			}]
+		}
 	}
 });
 // This will create a chart with all of the default options, merged from the global config,

From 08de9faf103d6b490dc87e6c436a8d5cb8ae00dc Mon Sep 17 00:00:00 2001
From: Simon Brunel <simonbrunel@users.noreply.github.com>
Date: Wed, 25 May 2016 00:04:59 +0200
Subject: [PATCH 10/10] Fix #2418 Firefox old version compatibility

Old versions of FF doesn't accept accessing the computed style via the 'max-width' and 'max-height' CSS notations using brackets, in which case the returned value is undefined. Changed the constraint methods to use maxWidth and mawHeight instead and make sure to test valid values.
---
 src/core/core.helpers.js | 44 ++++++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/src/core/core.helpers.js b/src/core/core.helpers.js
index 028ad3156..17aa0c9b8 100644
--- a/src/core/core.helpers.js
+++ b/src/core/core.helpers.js
@@ -732,21 +732,35 @@ module.exports = function(Chart) {
 		return valueInPixels;
 	}
 
+	/**
+	 * Returns if the given value contains an effective constraint.
+	 * @private
+	 */
+	function isConstrainedValue(value) {
+		return value !== undefined &&  value !== null && value !== 'none';
+	}
+
 	// Private helper to get a constraint dimension
 	// @param domNode : the node to check the constraint on
-	// @param maxStyle : the style that defines the maximum for the direction we are using (max-width / max-height)
+	// @param maxStyle : the style that defines the maximum for the direction we are using (maxWidth / maxHeight)
 	// @param percentageProperty : property of parent to use when calculating width as a percentage
+	// @see http://www.nathanaeljones.com/blog/2013/reading-max-width-cross-browser
 	function getConstraintDimension(domNode, maxStyle, percentageProperty) {
-		var constrainedDimension;
-		var constrainedNode = document.defaultView.getComputedStyle(domNode)[maxStyle];
-		var constrainedContainer = document.defaultView.getComputedStyle(domNode.parentNode)[maxStyle];
-		var hasCNode = constrainedNode !== null && constrainedNode !== "none";
-		var hasCContainer = constrainedContainer !== null && constrainedContainer !== "none";
+		var view = document.defaultView;
+		var parentNode = domNode.parentNode;
+		var constrainedNode = view.getComputedStyle(domNode)[maxStyle];
+		var constrainedContainer = view.getComputedStyle(parentNode)[maxStyle];
+		var hasCNode = isConstrainedValue(constrainedNode);
+		var hasCContainer = isConstrainedValue(constrainedContainer);
+		var infinity = Number.POSITIVE_INFINITY;
 
 		if (hasCNode || hasCContainer) {
-			constrainedDimension = Math.min((hasCNode ? parseMaxStyle(constrainedNode, domNode, percentageProperty) : Number.POSITIVE_INFINITY), (hasCContainer ? parseMaxStyle(constrainedContainer, domNode.parentNode, percentageProperty) : Number.POSITIVE_INFINITY));
+			return Math.min(
+				hasCNode? parseMaxStyle(constrainedNode, domNode, percentageProperty) : infinity,
+				hasCContainer? parseMaxStyle(constrainedContainer, parentNode, percentageProperty) : infinity);
 		}
-		return constrainedDimension;
+
+		return 'none';
 	}
 	// returns Number or undefined if no constraint
 	helpers.getConstraintWidth = function(domNode) {
@@ -759,26 +773,16 @@ module.exports = function(Chart) {
 	helpers.getMaximumWidth = function(domNode) {
 		var container = domNode.parentNode;
 		var padding = parseInt(helpers.getStyle(container, 'padding-left')) + parseInt(helpers.getStyle(container, 'padding-right'));
-
 		var w = container.clientWidth - padding;
 		var cw = helpers.getConstraintWidth(domNode);
-		if (cw !== undefined) {
-			w = Math.min(w, cw);
-		}
-
-		return w;
+		return isNaN(cw)? w : Math.min(w, cw);
 	};
 	helpers.getMaximumHeight = function(domNode) {
 		var container = domNode.parentNode;
 		var padding = parseInt(helpers.getStyle(container, 'padding-top')) + parseInt(helpers.getStyle(container, 'padding-bottom'));
-
 		var h = container.clientHeight - padding;
 		var ch = helpers.getConstraintHeight(domNode);
-		if (ch !== undefined) {
-			h = Math.min(h, ch);
-		}
-
-		return h;
+		return isNaN(ch)? h : Math.min(h, ch);
 	};
 	helpers.getStyle = function(el, property) {
 		return el.currentStyle ?