You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@myfaces.apache.org by pm...@apache.org on 2008/06/25 17:43:13 UTC

svn commit: r671584 - /myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java

Author: pmahoney
Date: Wed Jun 25 08:43:13 2008
New Revision: 671584

URL: http://svn.apache.org/viewvc?rev=671584&view=rev
Log:
TOMAHAWK-1290: Set the image resource path when using HtmlInputDate

Modified:
    myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java

Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java?rev=671584&r1=671583&r2=671584&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java Wed Jun 25 08:43:13 2008
@@ -481,7 +481,13 @@
         else
         {
             String imageLocation = HtmlRendererUtils.getImageLocation(uiComponent);
-            if (imageLocation != null)
+            if (imageLocation == null)
+            {
+                String uri = ar.getResourceUri(facesContext, HtmlCalendarRenderer.class, "images/");
+                setStringVariable(script, popupCalendarVariable + ".initData.imgDir",
+                        JavascriptUtils.encodeString(uri));
+            }
+            else
             {
                 setStringVariable(script, popupCalendarVariable + ".initData.imgDir",
                         (JavascriptUtils.encodeString(AddResourceFactory.getInstance(facesContext)