Merge branch 'v2.0-dev-refactor' of https://github.com/nnnick/Chart.js into v2.0-dev-refactor

This commit is contained in:
Evert Timberg 2015-09-25 21:04:57 -04:00
commit 68f563fba4

View File

@ -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) {