From fb803c07ea186fefdf48782f3583298f7f28df4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 8 Jul 2013 11:24:30 +0200 Subject: [PATCH] Use jQuery UI for parsing date strings --- js/tbl_zoom_plot_jqplot.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/js/tbl_zoom_plot_jqplot.js b/js/tbl_zoom_plot_jqplot.js index 83c7db5273..e6ed6f34c9 100644 --- a/js/tbl_zoom_plot_jqplot.js +++ b/js/tbl_zoom_plot_jqplot.js @@ -58,13 +58,13 @@ function isEmpty(obj) { **/ function getTimeStamp(val, type) { if (type.toString().search(/datetime/i) != -1 || type.toString().search(/timestamp/i) != -1) { - return getDateFromFormat(val, 'yyyy-MM-dd HH:mm:ss'); + return $.datepicker.parseDateTime('yy-mm-dd', 'HH:mm:ss', val); } else if (type.toString().search(/time/i) != -1) { - return getDateFromFormat('1970-01-01 ' + val, 'yyyy-MM-dd HH:mm:ss'); + return $.datepicker.parseDateTime('yy-mm-dd', 'HH:mm:ss', '1970-01-01 ' + val); } else if (type.toString().search(/date/i) != -1) { - return getDateFromFormat(val, 'yyyy-MM-dd'); + return $.datepicker.parseDate('yy-mm-dd', val); } }