From: Akihiko Kusanagi <nagi@nagi-p.com>
Date: Sat, 26 Aug 2017 05:50:39 +0000 (+0900)
Subject: Fix bar chart with {x, y} data points (#4673)
X-Git-Tag: v2.7.0~1^2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5d57de4e4d8fee2075d773f094d8b11f01ee2c66;p=thirdparty%2FChart.js.git

Fix bar chart with {x, y} data points (#4673)
---

diff --git a/docs/charts/bar.md b/docs/charts/bar.md
index 974cf8a71..524c79521 100644
--- a/docs/charts/bar.md
+++ b/docs/charts/bar.md
@@ -155,7 +155,7 @@ data: [20, 10]
 You can also specify the dataset as x/y coordinates.
 
 ```javascript
-data: [{x:'2016-12-25', y:20}, {'2016-12-26', y:10}]
+data: [{x:'2016-12-25', y:20}, {x:'2016-12-26', y:10}]
 ```
 
 # Stacked Bar Chart
diff --git a/src/controllers/controller.bar.js b/src/controllers/controller.bar.js
index baea1d949..ae4aee45d 100644
--- a/src/controllers/controller.bar.js
+++ b/src/controllers/controller.bar.js
@@ -362,7 +362,7 @@ module.exports = function(Chart) {
 		draw: function() {
 			var me = this;
 			var chart = me.chart;
-			var scale = me.getIndexScale();
+			var scale = me.getValueScale();
 			var rects = me.getMeta().data;
 			var dataset = me.getDataset();
 			var ilen = rects.length;