Fix bug for raw timeseries input - #311

d1783abe · Masayuki Tanaka · 32b6f93c · d1783abe · d1783abe
Commit d1783abe authored Jun 03, 2014 by Masayuki Tanaka
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 1 deletion

c3.js c3.js +11 -1

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

No files found.
--- a/c3.js
+++ b/c3.js
@@ -1464,7 +1464,17 @@
        function generateTargetX(rawX, id, index) {
            var x;
            if (isTimeSeries) {
-                x = rawX ? rawX instanceof Date ? rawX : parseDate(rawX) : parseDate(getXValue(id, index));
+                if (rawX) {
+                    if (typeof rawX === 'number') {
+                        x = new Date(rawX);
+                    } else if (rawX instanceof Date) {
+                        x = rawX;
+                    } else {
+                        x = parseDate(rawX);
+                    }
+                } else {
+                    x = parseDate(getXValue(id, index));
+                }
            }
            else if (isCustomX() && !isCategorized) {
                x = isValue(rawX) ? +rawX : getXValue(id, index);

--- a/c3.min.js
+++ b/c3.min.js