Author: gseitz
Date: Fri Dec 14 17:37:43 2007
New Revision: 604370

URL: http://svn.apache.org/viewvc?rev=604370&view=rev
Log:
WICKET-1208: strip jsessionId in url to wicket-date.js

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?rev=604370&r1=604369&r2=604370&view=diff
==============================================================================
--- 
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 Dec 14 17:37:43 2007
@@ -101,6 +101,11 @@
         */
        public static final DateFormat FORMAT_PAGEDATE = new 
SimpleDateFormat("MM/yyyy");
 
+       private static final ResourceReference YUI = new 
JavascriptResourceReference(YuiLib.class, "");
+
+       private static final ResourceReference WICKET_DATE = new 
JavascriptResourceReference(
+                       DatePicker.class, "wicket-date.js");
+
        private static final long serialVersionUID = 1L;
 
        /** The target component. */
@@ -175,10 +180,9 @@
                variables.put("fireChangeEvent", 
Boolean.valueOf(notifyComponentOnDateSelected()));
                variables.put("alignWithIcon", 
Boolean.valueOf(alignWithIcon()));
                // variables for YUILoader
-               variables.put("basePath", RequestCycle.get().urlFor(
-                               new JavascriptResourceReference(YuiLib.class, 
"")));
-               variables.put("wicketDatePath", RequestCycle.get().urlFor(
-                               new 
JavascriptResourceReference(DatePicker.class, "wicket-date.js")));
+               variables.put("basePath", 
Strings.stripJSessionId(RequestCycle.get().urlFor(YUI)));
+               variables.put("wicketDatePath", 
Strings.stripJSessionId(RequestCycle.get().urlFor(
+                               WICKET_DATE)));
                variables.put("hideOnSelect", Boolean.valueOf(hideOnSelect()));
                String script = getAdditionalJavascript();
                if (script != null)
@@ -343,10 +347,6 @@
        protected void configure(Map widgetProperties)
        {
                widgetProperties.put("close", Boolean.TRUE);
-               widgetProperties.put("title", " ");
-               // TODO we might want to localize the title nicer in the 
future, but for
-               // now, people can override this method or put "title" in the 
map in
-               // localize.
 
                // localize date fields
                localize(widgetProperties);


Reply via email to