You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by eh...@apache.org on 2007/04/10 08:41:47 UTC
svn commit: r527044 -
/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-datetime/src/main/java/wicket/extensions/yui/calendar/DatePicker.java
Author: ehillenius
Date: Mon Apr 9 23:41:46 2007
New Revision: 527044
URL: http://svn.apache.org/viewvc?view=rev&rev=527044
Log:
include pivot year (let it work with yy)
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-datetime/src/main/java/wicket/extensions/yui/calendar/DatePicker.java
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-datetime/src/main/java/wicket/extensions/yui/calendar/DatePicker.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-datetime/src/main/java/wicket/extensions/yui/calendar/DatePicker.java?view=diff&rev=527044&r1=527043&r2=527044
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-datetime/src/main/java/wicket/extensions/yui/calendar/DatePicker.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-datetime/src/main/java/wicket/extensions/yui/calendar/DatePicker.java Mon Apr 9 23:41:46 2007
@@ -188,24 +188,38 @@
buffer.append(" });\n");
buffer.append(" function showCalendar() {\n");
- buffer.append("var dateValue = YAHOO.util.Dom.get(\"");
- buffer.append(component.getMarkupId());
+ buffer.append("var dateValue = YAHOO.util.Dom.get(\"");
+ buffer.append(component.getMarkupId());
buffer.append("\").value;\n");
buffer.append("if (dateValue) {\n");
+ // TODO pivot year hack. kind of ugly, make a nicer fix sometime
+ buffer.append(" var dateArray = dateValue.split('/');\n");
+ buffer.append(" if (dateArray[2] != undefined) {");
+ buffer.append(" var year = dateArray[2];");
+ buffer.append(" if (year < 100) {");
+ buffer.append(" if (year < 50) {");
+ buffer.append(" year = year * 1 + 2000;");
+ buffer.append(" } else {");
+ buffer.append(" year = year * 1 + 1900;");
+ buffer.append(" }");
+ buffer.append(" dateValue = dateArray[0] + '/' + dateArray[1] + '/' + year;");
+ buffer.append(" }");
+ buffer.append(" }");
buffer.append(javascriptWidgetId);
buffer.append(".select(dateValue);\n");
buffer.append("var firstDate = ");
buffer.append(javascriptWidgetId);
buffer.append(".getSelectedDates()[0];");
buffer.append(javascriptWidgetId);
- buffer.append(".cfg.setProperty(\"pagedate\", (firstDate.getMonth()+1) + \"/\" + firstDate.getFullYear());");
+ buffer
+ .append(".cfg.setProperty(\"pagedate\", (firstDate.getMonth()+1) + \"/\" + firstDate.getFullYear());");
buffer.append(javascriptWidgetId);
buffer.append(".render();\n");
buffer.append("}\n");
buffer.append(javascriptWidgetId);
buffer.append(".show();\n");
buffer.append(" }\n");
-
+
// add a listener to the calendar widget that fills in the value
// of the passed in date text field when a selection is made,
// after which the widget is hidden again (it starts out hidden)
@@ -221,7 +235,6 @@
buffer.append(" var yr = selDateArray[0];\n");
buffer.append(" var month = selDateArray[1];\n");
buffer.append(" var dt = selDateArray[2];\n");
-
buffer.append(" var val = '");
String datePattern = getDatePattern();
// use the target component's pattern to fill in the date