diff --git a/ChangeLog b/ChangeLog index 5d48fcace..fe7a3dbf2 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ phpMyAdmin - Changelog $Id$ $Source$ +2004-04-27 Michal Cihar + * calendar.php, libraries/tbl_change.js: Don't reset clock when moving in + calendar. + 2004-04-27 Garvin Hicking * footer.inc.php: Fixed bug #942316 - Consistent window layout for query window. diff --git a/calendar.php b/calendar.php index 09ec3dc8c..c64aad88d 100644 --- a/calendar.php +++ b/calendar.php @@ -22,5 +22,6 @@ var day_names = new Array("");
+
diff --git a/libraries/tbl_change.js b/libraries/tbl_change.js index 44f703b5e..e360b3dff 100644 --- a/libraries/tbl_change.js +++ b/libraries/tbl_change.js @@ -118,6 +118,7 @@ var year; var hour; var minute; var second; +var clock_set = 0; /** * Opens calendar window. @@ -272,16 +273,28 @@ function initCalendar() { str += ""; + cnt.innerHTML = str; + // Should we handle time also? - if (window.opener.dateType != 'date') { + if (window.opener.dateType != 'date' && !clock_set) { + + if (document.getElementById) { + cnt = document.getElementById("clock_data"); + } else if (document.all) { + cnt = document.all["clock_data"]; + } + + str = ''; str += '
'; str += ':'; str += ':'; str += ''; str += '
'; + + cnt.innerHTML = str; + clock_set = 1; } - cnt.innerHTML = str; } /**