Author: gseitz
Date: Mon Oct 29 02:31:08 2007
New Revision: 589558
URL: http://svn.apache.org/viewvc?rev=589558&view=rev
Log:
WICKET-1109: fixed YUI Calendar only showing NaNs when input is completely
wrong (eg. 'xxx')
Modified:
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/wicket-date.js
Modified:
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/wicket-date.js
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/wicket-date.js?rev=589558&r1=589557&r2=589558&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/wicket-date.js
(original)
+++
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/wicket-date.js
Mon Oct 29 02:31:08 2007
@@ -33,6 +33,7 @@
*/
Wicket.DateTime.parseDate = function(pattern, value) {
numbers = value.match(/(\d+)/g);
+ if (numbers == null) return Number.NaN;
var day, month, year;
arrayPos = 0;
for (i = 0; i < pattern.length; i++) {
@@ -142,7 +143,7 @@
Wicket.DateTime.showCalendar = function(widget, date, datePattern) {
if (date) {
date = Wicket.DateTime.parseDate(datePattern, date);
- if (!isNaN(date.getTime())) {
+ if (!isNaN(date) && !isNaN(date.getTime())) {
widget.select(date);
firstDate = widget.getSelectedDates()[0];
widget.cfg.setProperty("pagedate",
(firstDate.getMonth() + 1) + "/" + firstDate.getFullYear());