Merge pull request #1121 from lbortoli/master

Fix for issue #1054
10 years ago · bfdf7de5ec
1 changed files with 1 additions and 1 deletions
--- a/src/core.js
+++ b/src/core.js
@ -1032,7 +1032,7 @@ c3_chart_internal_fn.parseDate = function (date) {
        parsedDate = date;
    } else if (typeof date === 'string') {
        parsedDate = $$.dataTimeFormat($$.config.data_xFormat).parse(date);
-    } else if (typeof date === 'number' || !isNaN(date)) {
+    } else if (typeof date === 'number' && !isNaN(date)) {
        parsedDate = new Date(+date);
    }
    if (!parsedDate || isNaN(+parsedDate)) {