readded ability to set axis.x.values to function

b1e09815 · michalkop93 · e2911205 · b1e09815 · b1e09815 · b1e09815
Commit b1e09815 authored Nov 21, 2014 by michalkop93
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

c3.js c3.js +1 -1

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

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

No files found.
--- a/c3.js
+++ b/c3.js
@@ -4025,7 +4025,7 @@
            },
            axis = c3_axis($$.d3, axisParams).scale(scale).orient(orient);

-        if ($$.isTimeSeries() && tickValues) {
+        if ($$.isTimeSeries() && tickValues && typeof tickValues !== "function") {
            tickValues = tickValues.map(function (v) { return $$.parseDate(v); });
        }


--- a/c3.min.js
+++ b/c3.min.js
--- a/src/axis.js
+++ b/src/axis.js
@@ -40,7 +40,7 @@ c3_chart_internal_fn.getXAxis = function (scale, orient, tickFormat, tickValues,
        },
        axis = c3_axis($$.d3, axisParams).scale(scale).orient(orient);

-    if ($$.isTimeSeries() && tickValues) {
+    if ($$.isTimeSeries() && tickValues && typeof tickValues !== "function") {
        tickValues = tickValues.map(function (v) { return $$.parseDate(v); });
    }