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/08/03 21:40:25 UTC
svn commit: r562560 -
/wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
Author: ehillenius
Date: Fri Aug 3 12:40:24 2007
New Revision: 562560
URL: http://svn.apache.org/viewvc?view=rev&rev=562560
Log:
fixed date picker issues with Safari and Opera by adding the initialization script to onDomReady handler
Modified:
wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
Modified: wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java?view=diff&rev=562560&r1=562559&r2=562560
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java (original)
+++ wicket/trunk/jdk-1.4/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java Fri Aug 3 12:40:24 2007
@@ -42,11 +42,11 @@
import org.apache.wicket.markup.html.IHeaderResponse;
import org.apache.wicket.markup.html.form.AbstractTextComponent.ITextFormatProvider;
import org.apache.wicket.markup.html.resources.JavascriptResourceReference;
-import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.IConverter;
import org.apache.wicket.util.convert.converters.DateConverter;
import org.apache.wicket.util.string.Strings;
-import org.apache.wicket.util.template.TextTemplateHeaderContributor;
+import org.apache.wicket.util.template.PackagedTextTemplate;
+import org.apache.wicket.util.template.TextTemplate;
import org.joda.time.DateTime;
@@ -147,9 +147,6 @@
*/
public void renderHead(IHeaderResponse response)
{
- // TODO do we really need this? without it, Safari won't eat it
- response.renderJavascriptReference(new JavascriptResourceReference(YuiLib.class,
- "yahoo/yahoo-min.js"));
// add YUILoader
response.renderJavascriptReference(new JavascriptResourceReference(YuiLib.class,
"yuiloader-beta.js"));
@@ -218,8 +215,9 @@
variables.put("calendarInit", calendarInit.toString());
// render initialization script with the variables interpolated
- TextTemplateHeaderContributor.forJavaScript(DatePicker.class, "DatePicker.js",
- Model.valueOf(variables)).renderHead(response);
+ TextTemplate datePickerJs = new PackagedTextTemplate(DatePicker.class, "DatePicker.js");
+ datePickerJs.interpolate(variables);
+ response.renderOnDomReadyJavascript(datePickerJs.asString());
}
/**