Fix handling of moments by scale.getRightValue

When using {x: moment, y: value} datapoints

diff --git a/src/core/core.scale.js b/src/core/core.scale.js
index e53265ed5c6d13fe2e81539c24ce683b4b081100..9861288cd33c93e2770351e2366416d9bd8ae3b0 100644 (file)
--- a/src/core/core.scale.js
+++ b/src/core/core.scale.js
@@ -396,7 +396,7 @@ module.exports = function(Chart) {
                        }
                        // If it is in fact an object, dive in one more level
                        if (typeof(rawValue) === "object") {
-                               if (rawValue instanceof Date) {
+                               if ((rawValue instanceof Date) || (rawValue.isValid)) {
                                        return rawValue;
                                } else {
                                        return getRightValue(this.isHorizontal() ? rawValue.x : rawValue.y);