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

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

Author: pyaschenko
Date: 2007-08-17 07:10:07 -0400 (Fri, 17 Aug 2007)
New Revision: 2306

Modified:
   trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx
Log:
RF-617 & RF-619 fixed

Modified: trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx
===================================================================
--- trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx	2007-08-17 11:08:08 UTC (rev 2305)
+++ trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx	2007-08-17 11:10:07 UTC (rev 2306)
@@ -94,7 +94,7 @@
 				String inputType = component.getAttributes().get("inputType").toString();
 				if(inputType.equals("readonly")){
 					readonly=Boolean.TRUE;
-					onclick = "$(this.form.id+':calendar').component.doExpand();";
+					onclick = "$('"+clientId+"').component.doExpand();";
 				}
 				else{
 					if (inputType.equals("hidden")){
@@ -132,31 +132,13 @@
 		<button id="#{clientId}PopupButton"
 				accesskey="#{component.attributes['accesskey']}"
 	 			name="#{clientId}"
-	 			onclick="$(this.form.id+':calendar').component.doExpand();"	 			
+	 			onclick="$('#{clientId}').component.doExpand();"	 			
 				style="#{component.attributes['style']}"
 				tabindex="#{component.attributes['tabindex']}"
 				type="button"
 				disabled="#{component.attributes['disabled']}">
 				#{component.attributes['buttonLabel']}
 		</button>
-		<jsp:scriptlet>
-		<![CDATA[        
-		         if(readonly.booleanValue() && !component.isDisabled()) { 
-		]]>
-		</jsp:scriptlet>
-		<a id="#{clientId}ResetButton"
-		href="#"
-		onclick="$('#{clientId}').component.resetSelectedDate();"
-		alt=""
-		style="margin-left:5px;"
-		>	
-		(x)	
-		</a>
-		<jsp:scriptlet>
-		<![CDATA[        
-				} 
-		]]>
-		</jsp:scriptlet> 
 	</span>
 			<jsp:scriptlet>
 		<![CDATA[