Mirrors/Chart.js
2
0
Fork 0
mirror of https://github.com/chartjs/Chart.js.git synced 2026-03-06 00:14:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bad values for data are now converted to NaN

Browse Source
This commit is contained in:
Tanner Linsley
2015-10-23 16:36:59 -06:00
parent 9d540cebb6
commit 7b13e902ff
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/core.scale.js
View File

@@ -315,10 +315,13 @@
isHorizontal: function() {
return this.options.position == "top" || this.options.position == "bottom";
},
// Get the correct value. If the value type is object get the x or y based on whether we are horizontal or not
// Get the correct value. NaN bad inputs, 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;
if (isNaN(rawValue) || rawValue === null || typeof(rawValue) === 'undefined') {
return NaN;
}
return typeof(rawValue) === "object" ? (this.isHorizontal() ? rawValue.x : rawValue.y) : rawValue;
},
// Used to get the value to display in the tooltip for the data at the given index