bug #1730367 Calendar "Go" has no effect

This commit is contained in:
Marc Delisle
2007-07-08 17:39:06 +00:00
parent e960142185
commit 7633c5e48e
3 changed files with 6 additions and 2 deletions

View File

@@ -13,6 +13,7 @@ $HeadURL$
- bug #1733012 Unwanted table alias in delete button - bug #1733012 Unwanted table alias in delete button
- bug #1736405 Pretty printer and HTML line breaks - bug #1736405 Pretty printer and HTML line breaks
- bug #1745257 Invalid DB name is still displayed - bug #1745257 Invalid DB name is still displayed
- bug #1730367 Calendar "Go" has no effect
2.10.2.0 (2007-06-15) 2.10.2.0 (2007-06-15)

View File

@@ -11,7 +11,7 @@ require('./libraries/header_meta_style.inc.php');
//<![CDATA[ //<![CDATA[
var month_names = new Array("<?php echo implode('","', $month); ?>"); var month_names = new Array("<?php echo implode('","', $month); ?>");
var day_names = new Array("<?php echo implode('","', $day_of_week); ?>"); var day_names = new Array("<?php echo implode('","', $day_of_week); ?>");
var submit_text = "<?php echo $strGo; ?>"; var submit_text = "<?php echo $strGo . ' (' . $strTime . ')'; ?>";
//]]> //]]>
</script> </script>
</head> </head>

View File

@@ -180,6 +180,7 @@ function initCalendar() {
second = parseInt(value.substr(12,2),10); second = parseInt(value.substr(12,2),10);
} }
} }
if (isNaN(year) || isNaN(month) || isNaN(day) || day == 0) { if (isNaN(year) || isNaN(month) || isNaN(day) || day == 0) {
dt = new Date(); dt = new Date();
year = dt.getFullYear(); year = dt.getFullYear();
@@ -300,13 +301,15 @@ function initCalendar() {
init_hour = hour; init_hour = hour;
init_minute = minute; init_minute = minute;
init_second = second; init_second = second;
str += '<fieldset>';
str += '<form method="NONE" class="clock" onsubmit="returnDate(\'' + current_date + '\')">'; str += '<form method="NONE" class="clock" onsubmit="returnDate(\'' + current_date + '\')">';
str += '<input id="hour" type="text" size="2" maxlength="2" onblur="this.value=formatNum2d(this.value, init_hour, \'hour\'); init_hour = this.value;" value="' + formatNum2(hour, 'hour') + '" />:'; str += '<input id="hour" type="text" size="2" maxlength="2" onblur="this.value=formatNum2d(this.value, init_hour, \'hour\'); init_hour = this.value;" value="' + formatNum2(hour, 'hour') + '" />:';
str += '<input id="minute" type="text" size="2" maxlength="2" onblur="this.value=formatNum2d(this.value, init_minute, \'minute\'); init_minute = this.value;" value="' + formatNum2(minute, 'minute') + '" />:'; str += '<input id="minute" type="text" size="2" maxlength="2" onblur="this.value=formatNum2d(this.value, init_minute, \'minute\'); init_minute = this.value;" value="' + formatNum2(minute, 'minute') + '" />:';
str += '<input id="second" type="text" size="2" maxlength="2" onblur="this.value=formatNum2d(this.value, init_second, \'second\'); init_second = this.value;" value="' + formatNum2(second, 'second') + '" />'; str += '<input id="second" type="text" size="2" maxlength="2" onblur="this.value=formatNum2d(this.value, init_second, \'second\'); init_second = this.value;" value="' + formatNum2(second, 'second') + '" />';
str += '<br />'; str += '&nbsp;&nbsp;';
str += '<input type="submit" value="' + submit_text + '"/>'; str += '<input type="submit" value="' + submit_text + '"/>';
str += '</form>'; str += '</form>';
str += '</fieldset>';
cnt.innerHTML = str; cnt.innerHTML = str;
clock_set = 1; clock_set = 1;