Fix undefined when axis.x.tick.count specified on category axis - #935

d3d4c5d7 · Masayuki Tanaka · 1635f41a · d3d4c5d7 · d3d4c5d7 · d3d4c5d7
Commit d3d4c5d7 authored Jan 26, 2015 by Masayuki Tanaka
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

c3.js c3.js +2 -1

c3.min.js c3.min.js +0 -0

c3.axis.js src/c3.axis.js +2 -1

No files found.
--- a/c3.js
+++ b/c3.js
@@ -6657,7 +6657,8 @@
            return newScale;
        }
        function textFormatted(v) {
-            return tickFormat ? tickFormat(v) : v;
+            var formatted = tickFormat ? tickFormat(v) : v;
+            return typeof formatted !== 'undefined' ? formatted : '';
        }
        function getSizeFor1Char(tick) {
            if (tickTextCharSize) {

--- a/c3.min.js
+++ b/c3.min.js
--- a/src/c3.axis.js
+++ b/src/c3.axis.js
@@ -48,7 +48,8 @@ function c3_axis(d3, params) {
        return newScale;
    }
    function textFormatted(v) {
-        return tickFormat ? tickFormat(v) : v;
+        var formatted = tickFormat ? tickFormat(v) : v;
+        return typeof formatted !== 'undefined' ? formatted : '';
    }
    function getSizeFor1Char(tick) {
        if (tickTextCharSize) {