From 94c1ec4b849d8857129c2552b39a47cf0c02de79 Mon Sep 17 00:00:00 2001 From: Fabian Strachanski Date: Thu, 13 Aug 2015 10:50:56 +0200 Subject: [PATCH] Fix for #1373 --- src/scales/scale.linear.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scales/scale.linear.js b/src/scales/scale.linear.js index c9827e02e..642ea0c49 100644 --- a/src/scales/scale.linear.js +++ b/src/scales/scale.linear.js @@ -157,7 +157,7 @@ }, // Get the correct value. If the value type is object get the x or y based on whether we are horizontal or not getRightValue: function(rawValue) { - return typeof rawValue === "object" ? (this.isHorizontal() ? rawValue.x : rawValue.y) : rawValue; + return typeof (rawValue === "object" && rawValue !== null) ? (this.isHorizontal() ? rawValue.x : rawValue.y) : rawValue; }, getPixelForValue: function(value) { // This must be called after fit has been run so that -- 2.47.2