Ensure that when we check typeof x == 'number' we also check

chartjs · Oct 1, 2018 · 1e69c98 · 1e69c98
1 parent 9293c30
commit 1e69c98
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/core/core.element.js b/src/core/core.element.js
@@ -42,7 +42,7 @@ function interpolate(start, view, model, ease) {
 						continue;
 					}
 				}
-			} else if (type === 'number' && isFinite(origin) && isFinite(target)) {
+			} else if ((type === 'number' || target instanceof Number) && isFinite(origin) && isFinite(target)) {
 				view[key] = origin + (target - origin) * ease;
 				continue;
 			}

diff --git a/src/core/core.scale.js b/src/core/core.scale.js
@@ -519,7 +519,7 @@ module.exports = Element.extend({
 			return NaN;
 		}
 		// isNaN(object) returns true, so make sure NaN is checking for a number; Discard Infinite values
-		if (typeof rawValue === 'number' && !isFinite(rawValue)) {
+		if ((typeof rawValue === 'number' || rawValue instanceof Number) && !isFinite(rawValue)) {
 			return NaN;
 		}
 		// If it is in fact an object, dive in one more level

diff --git a/src/plugins/plugin.filler.js b/src/plugins/plugin.filler.js
@@ -128,7 +128,7 @@ function computeBoundary(source) {
 			return target;
 		}
 
-		if (typeof target === 'number' && isFinite(target)) {
+		if ((typeof target === 'number' || target instanceof Number) && isFinite(target)) {
 			horizontal = scale.isHorizontal();
 			return {
 				x: horizontal ? target : null,