]> git.ipfire.org Git - thirdparty/Chart.js.git/commitdiff
Fix #2009 2065/head
authorEvert Timberg <evert.timberg@gmail.com>
Sat, 27 Feb 2016 13:58:27 +0000 (08:58 -0500)
committerEvert Timberg <evert.timberg@gmail.com>
Sat, 27 Feb 2016 13:58:27 +0000 (08:58 -0500)
src/scales/scale.time.js

index 629d4125615372d152f9bea90f8026b4c6af43ac..3e35b539453eee70a08e98ebcdcb98b4f53ec0c4 100644 (file)
@@ -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.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);
+                                       return this.top + Math.round(heightOffset);
+                               }
                        }
                },
                parseTime: function(label) {