myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lu4...@apache.org
Subject svn commit: r1098635 - /myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java
Date Mon, 02 May 2011 15:58:20 GMT
Author: lu4242
Date: Mon May  2 15:58:20 2011
New Revision: 1098635

URL: http://svn.apache.org/viewvc?rev=1098635&view=rev
Log:
TOMAHAWK-1581 selectText() javascript function not found

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

Modified: myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java?rev=1098635&r1=1098634&r2=1098635&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java
(original)
+++ myfaces/tomahawk/trunk/core20/src/main/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java
Mon May  2 15:58:20 2011
@@ -130,7 +130,12 @@ public class HtmlCalendarRenderer
         
         if (inputCalendar.isRenderAsPopup() && inputCalendar.isAddResources())
         {
-            addScriptAndCSSResourcesWithJSF2ResourceAPI(FacesContext.getCurrentInstance(),
inputCalendar);
+            FacesContext facesContext = FacesContext.getCurrentInstance();
+            if (!facesContext.getAttributes().containsKey(JAVASCRIPT_ENCODED_JSF2))
+            {
+                TomahawkResourceUtils.addOutputScriptResource(facesContext, "oam.custom.inputTextHelp",
"inputTextHelp.js");
+            }
+            addScriptAndCSSResourcesWithJSF2ResourceAPI(facesContext, inputCalendar);
         }
     }
 



Mime
View raw message