Merge branch 'v2.0-dev' of https://github.com/nnnick/Chart.js into fix/template-caching

This commit is contained in:
Evert Timberg 2015-08-15 10:57:13 -04:00
commit 3dd2ee7968

View File

@ -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" && rawValue !== null) ? (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