From: Evert Timberg <evert.timberg@gmail.com>
Date: Sun, 18 Oct 2015 23:34:56 +0000 (-0400)
Subject: Fix some test failures
X-Git-Tag: 2.0.0-beta~4^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=86a52d030233944cdedc14bc1c5076c74826ea87;p=thirdparty%2FChart.js.git

Fix some test failures
---

diff --git a/src/core/core.scale.js b/src/core/core.scale.js
index e768726ce..556ea0039 100644
--- a/src/core/core.scale.js
+++ b/src/core/core.scale.js
@@ -48,7 +48,7 @@
 			reverse: false,
 			show: true,
 			callback: function(value) {
-				return value;
+				return '' + value;
 			},
 		},
 	};
diff --git a/src/scales/scale.logarithmic.js b/src/scales/scale.logarithmic.js
index 59c3dd44f..9f5b62c47 100644
--- a/src/scales/scale.logarithmic.js
+++ b/src/scales/scale.logarithmic.js
@@ -10,7 +10,15 @@
 
 		// label settings
 		ticks: {
-			template: "<%var remain = value / (Math.pow(10, Math.floor(Chart.helpers.log10(value))));if (remain === 1 || remain === 2 || remain === 5) {%><%=value.toExponential()%><%} else {%><%= null %><%}%>",
+			callback: function(value) {
+				var remain = value / (Math.pow(10, Math.floor(Chart.helpers.log10(value))));
+
+				if (remain === 1 || remain === 2 || remain === 5) {
+					return value.toExponential()
+				} else {
+					return '';
+				}
+			}
 		}
 	};