Fix tick format for timeseries

1669ec46 · Masayuki Tanaka · 5ef894aa · 1669ec46 · 1669ec46 · 1669ec46
Commit 1669ec46 authored Aug 16, 2014 by Masayuki Tanaka
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

c3.js c3.js +2 -2

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

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

No files found.
--- a/c3.js
+++ b/c3.js
@@ -3916,7 +3916,7 @@
        var $$ = this, config = $$.config,
            format = $$.isTimeSeries() ? $$.defaultAxisTimeFormat : $$.isCategorized() ? $$.categoryName : function (v) { return v < 0 ? v.toFixed(0) : v; };
        if (config[__axis_x_tick_format]) {
-            if (config[__axis_x_tick_format]) {
+            if (isFunction(config[__axis_x_tick_format])) {
                format = config[__axis_x_tick_format];
            } else if ($$.isTimeSeries()) {
                format = function (date) {
@@ -3924,7 +3924,7 @@
                };
            }
        }
-        return function (v) { return format.call($$, v); };
+        return isFunction(format) ? function (v) { return format.call($$, v); } : format;
    };
    c3_chart_internal_fn.getAxisLabelOptionByAxisId = function (axisId) {
        var $$ = this, config = $$.config, option;

--- a/c3.min.js
+++ b/c3.min.js
--- a/src/axis.js
+++ b/src/axis.js
@@ -63,7 +63,7 @@ c3_chart_internal_fn.getXAxisTickFormat = function () {
    var $$ = this, config = $$.config,
        format = $$.isTimeSeries() ? $$.defaultAxisTimeFormat : $$.isCategorized() ? $$.categoryName : function (v) { return v < 0 ? v.toFixed(0) : v; };
    if (config[__axis_x_tick_format]) {
-        if (config[__axis_x_tick_format]) {
+        if (isFunction(config[__axis_x_tick_format])) {
            format = config[__axis_x_tick_format];
        } else if ($$.isTimeSeries()) {
            format = function (date) {
@@ -71,7 +71,7 @@ c3_chart_internal_fn.getXAxisTickFormat = function () {
            };
        }
    }
-    return function (v) { return format.call($$, v); };
+    return isFunction(format) ? function (v) { return format.call($$, v); } : format;
 };
 c3_chart_internal_fn.getAxisLabelOptionByAxisId = function (axisId) {
    var $$ = this, config = $$.config, option;