Fix some test failures

diff --git a/src/core/core.scale.js b/src/core/core.scale.js
index e768726ce7447d1662e4203c3e04953085d7fec1..556ea0039fe2b38095297a23ba661933affad8ac 100644 (file)
--- 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 59c3dd44f28701ebcff5de37e98a2abfb7d495d0..9f5b62c47f682fc7b1e3fabdd1b08aa85e1c0520 100644 (file)
--- 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 '';
+                               }
+                       }
                }
        };