From efa453a8a0603d1350c74656785fb17f0bc0fcd3 Mon Sep 17 00:00:00 2001 From: Viduranga Wijesooriya Date: Thu, 30 Jan 2014 19:04:04 +0530 Subject: [PATCH] fixed bug #4257 Hide fractional seconds #2 Signed-off-by: Viduranga Wijesooriya --- js/makegrid.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/js/makegrid.js b/js/makegrid.js index 5d95c717d0..6200b19313 100644 --- a/js/makegrid.js +++ b/js/makegrid.js @@ -1020,11 +1020,12 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi parseInt(current_datetime_value.substring(5, 7)) - 1, parseInt(current_datetime_value.substring(8, 10)) ); - if (current_datetime_value.match("^\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}\\.\\d{"+ no_decimals +"}$")) { - var hour = current_datetime_value.substring(11, 13); - var min = current_datetime_value.substring(14, 16); - var sec = current_datetime_value.substring(17, 19); + var no_decimals = $td.data('decimals'); + var hour = current_datetime_value.substring(11, 13); + var min = current_datetime_value.substring(14, 16); + var sec = current_datetime_value.substring(17, 19); + if (current_datetime_value.match("^\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}\\.\\d{"+ no_decimals +"}$")) { if (no_decimals > 3){ var milli = current_datetime_value.substring(20, 23); var micro = current_datetime_value.substring(23); @@ -1042,6 +1043,10 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi date.setHours(hour, min, sec, milli); date.setMicroseconds(micro); + } + if (current_datetime_value.match("^\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}")) { + console.log("G"); + date.setHours(hour, min, sec); } $editArea.datetimepicker('setDate', date); }