nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't reset clock when moving in calendar.

Browse Source
This commit is contained in:
Michal Čihař
2004-04-27 08:59:59 +00:00
parent 1a42b4a85a
commit 249096945d
3 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2004-04-27 Michal Cihar <michal@cihar.com>
* calendar.php, libraries/tbl_change.js: Don't reset clock when moving in
calendar.
2004-04-27 Garvin Hicking <pma@supergarv.de> 2004-04-27 Garvin Hicking <pma@supergarv.de>
* footer.inc.php: Fixed bug #942316 - Consistent window layout for * footer.inc.php: Fixed bug #942316 - Consistent window layout for
query window. query window.

1
calendar.php
View File

@@ -22,5 +22,6 @@ var day_names = new Array("<?php echo implode('","', $day_of_week); ?>");
</head> </head>
<body onload="initCalendar();"> <body onload="initCalendar();">
<div id="calendar_data"></div> <div id="calendar_data"></div>
<div id="clock_data"></div>
</body> </body>
</html> </html>

17
libraries/tbl_change.js
View File

@@ -118,6 +118,7 @@ var year;
var hour; var hour;
var minute; var minute;
var second; var second;
var clock_set = 0;
/** /**
* Opens calendar window. * Opens calendar window.
@@ -272,16 +273,28 @@ function initCalendar() {
str += "</tr></table>"; str += "</tr></table>";
cnt.innerHTML = str;
// Should we handle time also? // 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 += '<form class="clock">'; str += '<form class="clock">';
str += '<input id="hour" type="text" size="2" maxlength="2" value="' + formatNum2(hour) + '" />:'; str += '<input id="hour" type="text" size="2" maxlength="2" value="' + formatNum2(hour) + '" />:';
str += '<input id="minute" type="text" size="2" maxlength="2" value="' + formatNum2(minute) + '" />:'; str += '<input id="minute" type="text" size="2" maxlength="2" value="' + formatNum2(minute) + '" />:';
str += '<input id="second" type="text" size="2" maxlength="2" value="' + formatNum2(second) + '" />'; str += '<input id="second" type="text" size="2" maxlength="2" value="' + formatNum2(second) + '" />';
str += '</form>'; str += '</form>';
cnt.innerHTML = str;
clock_set = 1;
} }
cnt.innerHTML = str;
} }
/** /**