From: Tanner Linsley <tannerlinsley@gmail.com>
Date: Fri, 25 Sep 2015 04:49:43 +0000 (-0600)
Subject: I guess, don't include the offset. Bars now align correctly.
X-Git-Tag: 2.0.0-alpha4~12^2~9^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b8d8ff8bae4b0ef0e94e645e333c3badb0d81731;p=thirdparty%2FChart.js.git

I guess, don't include the offset. Bars now align correctly.
---

diff --git a/src/controllers/controller.bar.js b/src/controllers/controller.bar.js
index 648a61b7d..3ec3be6da 100644
--- a/src/controllers/controller.bar.js
+++ b/src/controllers/controller.bar.js
@@ -273,7 +273,7 @@
 			var xScale = this.getScaleForID(this.getDataset().xAxisID);
 
 			var ruler = this.getRuler();
-			var leftTick = xScale.getPixelForValue(null, index, datasetIndex, true);
+			var leftTick = xScale.getPixelForValue(null, index, datasetIndex, this.chart.isCombo);
 			leftTick -= this.chart.isCombo ? (ruler.tickWidth / 2) : 0;
 
 			if (yScale.options.stacked) {