From 8efa577ef518e6649c2eed31c445b9d31e6cc5e6 Mon Sep 17 00:00:00 2001
From: etimberg <evert.timberg@gmail.com>
Date: Tue, 15 Dec 2015 20:13:37 -0500
Subject: [PATCH 1/3] Bar dataset controller needs a better way to know which
 datasets are bars since users could make their own bar types.

---
 src/controllers/controller.bar.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/controllers/controller.bar.js b/src/controllers/controller.bar.js
index c1c667d33..da09ddf3f 100644
--- a/src/controllers/controller.bar.js
+++ b/src/controllers/controller.bar.js
@@ -31,16 +31,18 @@
 	};
 
 	Chart.controllers.bar = Chart.DatasetController.extend({
+		initialize: function(chart, datasetIndex) {
+			Chart.DatasetController.prototype.initialize.call(this, chart, datasetIndex);
+
+			// Use this to indicate that this is a bar dataset. 
+			this.getDataset().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;
 			helpers.each(this.chart.data.datasets, function(dataset) {
-				if (helpers.isDatasetVisible(dataset)) {
-					if (dataset.type === 'bar') {
-						++barCount;
-					} else if (dataset.type === undefined && this.chart.config.type === 'bar') {
-						++barCount;
-					}
+				if (helpers.isDatasetVisible(dataset) && dataset.bar) {
+					++barCount;
 				}
 			}, this);
 			return barCount;

From 9aee15fe6cd6b0817a34214600483e5814def820 Mon Sep 17 00:00:00 2001
From: etimberg <evert.timberg@gmail.com>
Date: Tue, 15 Dec 2015 20:19:32 -0500
Subject: [PATCH 2/3] Updated docs

---
 docs/07-Advanced.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/07-Advanced.md b/docs/07-Advanced.md
index d040d4584..8bc94cc1f 100644
--- a/docs/07-Advanced.md
+++ b/docs/07-Advanced.md
@@ -360,6 +360,9 @@ The built in controller types are:
 * `Chart.controllers.polarArea`
 * `Chart.controllers.bubble`
 
+#### Bar Controller
+The bar controller has a special property that you should be aware of. To correctly calculate the width of a bar, the controller must determine the number of datasets that map to bars. To do this, the bar controller attaches a property `bar` to the dataset during initialization. If you are creating a replacement or updated bar controller, you should do the same. This will ensure that charts with regular bars and your new derived bars will work seamlessly.
+
 ### Building Chart.js
 
 Chart.js uses <a href="http://gulpjs.com/" target="_blank">gulp</a> to build the library into a single JavaScript file. 

From 283f1d73872254a987d9a7f78aa0697588056312 Mon Sep 17 00:00:00 2001
From: Evert Timberg <evert.timberg@gmail.com>
Date: Thu, 17 Dec 2015 09:31:01 -0500
Subject: [PATCH 3/3] Update check to new system + fix tests

---
 src/controllers/controller.bar.js |  3 +--
 test/controller.bar.tests.js      | 14 +++++++-------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/controllers/controller.bar.js b/src/controllers/controller.bar.js
index da09ddf3f..72e1fb9b7 100644
--- a/src/controllers/controller.bar.js
+++ b/src/controllers/controller.bar.js
@@ -217,8 +217,7 @@
 			var barIndex = 0;
 
 			for (var j = 0; j < datasetIndex; ++j) {
-				if (helpers.isDatasetVisible(this.chart.data.datasets[j]) &&
-					(this.chart.data.datasets[j].type === 'bar' || (this.chart.data.datasets[j].type === undefined && this.chart.config.type === 'bar'))) {
+				if (helpers.isDatasetVisible(this.chart.data.datasets[j]) && this.chart.data.datasets[j].bar) {
 					++barIndex;
 				}
 			}
diff --git a/test/controller.bar.tests.js b/test/controller.bar.tests.js
index f01d9a301..97d39f71e 100644
--- a/test/controller.bar.tests.js
+++ b/test/controller.bar.tests.js
@@ -52,11 +52,10 @@ describe('Bar controller tests', function() {
 		var chart = {
 			data: {
 				datasets: [{
-					type: 'line'
 				}, {
-					type: 'bar'
+					bar: true
 				}, {
-					// no type, defaults to bar
+					bar: true
 				}]
 			},
 			config: {
@@ -82,13 +81,13 @@ describe('Bar controller tests', function() {
 		var chart = {
 			data: {
 				datasets: [{
-					
+					bar: true,
 				}, {
+					bar: true,
 					hidden: true
 				}, {
-					type: 'line'
 				}, {
-					
+					bar: true,
 				}]
 			},
 			config: {
@@ -148,7 +147,8 @@ describe('Bar controller tests', function() {
 				data: [1, 2],
 				label: 'dataset1',
 				xAxisID: 'firstXScaleID',
-				yAxisID: 'firstYScaleID'
+				yAxisID: 'firstYScaleID',
+				bar: true
 			}, {
 				data: [10, 15, 0, -4],
 				label: 'dataset2'