[richfaces-svn-commits] JBoss Rich Faces SVN: r2489 - trunk/ui/calendar/src/main/templates/org/richfaces.

[richfaces-svn-commits at lists.jboss.org]

Author: nbelaevski
Date: 2007-08-24 17:56:45 -0400 (Fri, 24 Aug 2007)
New Revision: 2489

Modified:
   trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx
Log:
http://jira.jboss.com/jira/browse/RF-666

Modified: trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx
===================================================================
--- trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx	2007-08-24 19:13:37 UTC (rev 2488)
+++ trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx	2007-08-24 21:56:45 UTC (rev 2489)
@@ -84,11 +84,16 @@
 				);
 		</script> 
 	</div>
+
+	<f:call name="addPopupToAjaxRendered" />
+	
+	<span id="#{clientId}Popup" >
 	<jsp:scriptlet>
 		<![CDATA[
 				boolean popup = getUtils().isBooleanAttribute(component, "popup");
-				if (popup) {
-				addPopupToAjaxRendered(context, component);
+				if (!popup) {
+					getUtils().writeAttribute(writer, "style", "display: none");
+				} else {
 								
 				boolean showInput = getUtils().isBooleanAttribute(component, "showInput");
 				boolean manualInput = getUtils().isBooleanAttribute(component, "enableManualInput");
@@ -111,7 +116,6 @@
 				
 		</jsp:scriptlet>
 		<f:resource	name="org.richfaces.renderkit.html.iconimages.CalendarIcon" var="icon" />
-			<span id="#{clientId}Popup" >
 			<input 
 				id="#{clientId}InputDate"
 				name="#{clientId}InputDate"
@@ -140,10 +144,10 @@
 				style="vertical-align: middle"
 				tabindex="#{component.attributes['tabindex']}">
 			</img>
-	</span>
 			<jsp:scriptlet>
 		<![CDATA[
 				} 
 		]]>
 	</jsp:scriptlet> 
+	</span>
 </f:root>