From b812bcc8a58707831419c0d803ecb179fcf17c6c Mon Sep 17 00:00:00 2001 From: Evert Timberg Date: Sat, 27 Feb 2016 08:58:27 -0500 Subject: [PATCH] Fix #2009 --- src/scales/scale.time.js | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/src/scales/scale.time.js b/src/scales/scale.time.js index 629d41256..3e35b5394 100644 --- a/src/scales/scale.time.js +++ b/src/scales/scale.time.js @@ -270,22 +270,25 @@ module.exports = function(Chart) { }, getPixelForValue: function(value, index, datasetIndex, includeOffset) { 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 innerWidth = this.width - (this.paddingLeft + this.paddingRight); - var valueWidth = innerWidth / Math.max(this.ticks.length - 1, 1); - var valueOffset = (innerWidth * decimal) + this.paddingLeft; + var decimal = offset / this.tickRange; - 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; + if (this.isHorizontal()) { + 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.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) {