From: Evert Timberg <evert.timberg@gmail.com>
Date: Sun, 15 Nov 2015 03:49:53 +0000 (-0500)
Subject: Handle transitioning NaNs
X-Git-Tag: 2.0.0-beta1~25^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d61745a31155843fd0583f3c6c0a08673e0d4a93;p=thirdparty%2FChart.js.git

Handle transitioning NaNs
---

diff --git a/src/core/core.element.js b/src/core/core.element.js
index 594269619..d9c0d35a6 100644
--- a/src/core/core.element.js
+++ b/src/core/core.element.js
@@ -38,7 +38,7 @@
 
 				// Init if doesn't exist
 				else if (!this._view[key]) {
-					if (typeof value === 'number') {
+					if (typeof value === 'number' && isNaN(this._view[key]) === false) {
 						this._view[key] = value * ease;
 					} else {
 						this._view[key] = value || null;
@@ -61,14 +61,13 @@
 				}
 				// Number transitions
 				else if (typeof value === 'number') {
-					var startVal = this._start[key] !== undefined ? this._start[key] : 0;
+					var startVal = this._start[key] !== undefined && isNaN(this._start[key]) === false ? this._start[key] : 0;
 					this._view[key] = ((this._model[key] - startVal) * ease) + startVal;
 				}
 				// Everything else
 				else {
 					this._view[key] = value;
 				}
-
 			}, this);
 
 			if (ease === 1) {
diff --git a/src/scales/scale.radialLinear.js b/src/scales/scale.radialLinear.js
index 15fdb3626..4d622cc98 100644
--- a/src/scales/scale.radialLinear.js
+++ b/src/scales/scale.radialLinear.js
@@ -272,7 +272,10 @@
 			return index * angleMultiplier - (Math.PI / 2);
 		},
 		getDistanceFromCenterForValue: function(value) {
-			if (value === null) return 0; // null always in center
+			if (value === null || value === undefined || isNaN(value)) {
+				return 0; // null always in center	
+			} 
+			
 			// Take into account half font size + the yPadding of the top value
 			var scalingFactor = this.drawingArea / (this.max - this.min);
 			if (this.options.reverse) {