Commit a82186e4 authored by Masayuki Tanaka's avatar Masayuki Tanaka

Set default for data.x_format - #268

parent f696fad2
...@@ -140,7 +140,7 @@ ...@@ -140,7 +140,7 @@
var __data_x = getConfig(['data', 'x']), var __data_x = getConfig(['data', 'x']),
__data_xs = getConfig(['data', 'xs'], {}), __data_xs = getConfig(['data', 'xs'], {}),
__data_x_format = getConfig(['data', 'x_format']), __data_x_format = getConfig(['data', 'x_format'], '%Y-%m-%d'),
__data_id_converter = getConfig(['data', 'id_converter'], function (id) { return id; }), __data_id_converter = getConfig(['data', 'id_converter'], function (id) { return id; }),
__data_names = getConfig(['data', 'names'], {}), __data_names = getConfig(['data', 'names'], {}),
__data_classes = getConfig(['data', 'classes'], {}), __data_classes = getConfig(['data', 'classes'], {}),
...@@ -2239,7 +2239,7 @@ ...@@ -2239,7 +2239,7 @@
function parseDate(date) { function parseDate(date) {
var parsedDate; var parsedDate;
try { try {
parsedDate = date instanceof Date || !__data_x_format ? new Date(date) : d3.time.format(__data_x_format).parse(date); parsedDate = date instanceof Date ? new Date(date) : d3.time.format(__data_x_format).parse(date);
} catch (e) { } catch (e) {
window.console.error("Failed to parse x '" + date + "' to Date with format " + __data_x_format); window.console.error("Failed to parse x '" + date + "' to Date with format " + __data_x_format);
} }
......
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment