Handle transitioning NaNs

diff --git a/src/core/core.element.js b/src/core/core.element.js
index 5942696199f09a93d864b7d941e7a6893f3dc984..d9c0d35a623715987693e2be9fe142b535bdd1da 100644 (file)
--- 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 15fdb36269672488706033687f2d225cfb890efe..4d622cc98aa2cd059a06f487f2870118781e41d9 100644 (file)
--- 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) {