This commit is contained in:
Evert Timberg 2016-02-27 08:58:27 -05:00
parent 6ad533ce2b
commit b812bcc8a5

View File

@ -270,22 +270,25 @@ module.exports = function(Chart) {
}, },
getPixelForValue: function(value, index, datasetIndex, includeOffset) { getPixelForValue: function(value, index, datasetIndex, includeOffset) {
var labelMoment = this.getLabelMoment(datasetIndex, index); var labelMoment = this.getLabelMoment(datasetIndex, index);
var offset = labelMoment.diff(this.firstTick, this.tickUnit, true);
var decimal = offset / this.tickRange; if (labelMoment) {
var offset = labelMoment.diff(this.firstTick, this.tickUnit, true);
if (this.isHorizontal()) { var decimal = offset / this.tickRange;
var innerWidth = this.width - (this.paddingLeft + this.paddingRight);
var valueWidth = innerWidth / Math.max(this.ticks.length - 1, 1);
var valueOffset = (innerWidth * decimal) + this.paddingLeft;
return this.left + Math.round(valueOffset); if (this.isHorizontal()) {
} else { var innerWidth = this.width - (this.paddingLeft + this.paddingRight);
var innerHeight = this.height - (this.paddingTop + this.paddingBottom); var valueWidth = innerWidth / Math.max(this.ticks.length - 1, 1);
var valueHeight = innerHeight / Math.max(this.ticks.length - 1, 1); var valueOffset = (innerWidth * decimal) + this.paddingLeft;
var heightOffset = (innerHeight * decimal) + this.paddingTop;
return this.top + Math.round(heightOffset); return this.left + Math.round(valueOffset);
} else {
var innerHeight = this.height - (this.paddingTop + this.paddingBottom);
var valueHeight = innerHeight / Math.max(this.ticks.length - 1, 1);
var heightOffset = (innerHeight * decimal) + this.paddingTop;
return this.top + Math.round(heightOffset);
}
} }
}, },
parseTime: function(label) { parseTime: function(label) {