You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mm...@apache.org on 2005/08/29 05:49:19 UTC
svn commit: r264047 -
/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/date/HtmlDateRenderer.java
Author: mmarinschek
Date: Sun Aug 28 20:49:15 2005
New Revision: 264047
URL: http://svn.apache.org/viewcvs?rev=264047&view=rev
Log:
Fix for MYFACES-449. Thanks to Ron Smits for supplying this patch.
Modified:
myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/date/HtmlDateRenderer.java
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/date/HtmlDateRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/date/HtmlDateRenderer.java?rev=264047&r1=264046&r2=264047&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/date/HtmlDateRenderer.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/date/HtmlDateRenderer.java Sun Aug 28 20:49:15 2005
@@ -92,15 +92,17 @@
if( inputDate.isPopupCalendar() && ! disabled && ! readonly )
encodePopupCalendarButton(facesContext, uiComponent, writer, clientId, currentLocale);
}
- if( type.equals("both") ){
+ if( type.equals("both") || type.equals("full")){
writer.write(" ");
}
if( ! type.equals("date")){
encodeInputHours(uiComponent, writer, clientId, userData, disabled, readonly);
writer.write(":");
encodeInputMinutes(uiComponent, writer, clientId, userData, disabled, readonly);
- writer.write(":");
- encodeInputSeconds(uiComponent, writer, clientId, userData, disabled, readonly);
+ if (type.equals("full")|| type.equals("time")) {
+ writer.write(":");
+ encodeInputSeconds(uiComponent, writer, clientId, userData, disabled, readonly);
+ }
}
writer.endElement(HTML.SPAN_ELEM);
@@ -253,7 +255,8 @@
if( ! type.equals( "date" ) ){
userData.setHours( (String) requestMap.get(clientId + ID_HOURS_POSTFIX) );
userData.setMinutes( (String) requestMap.get(clientId + ID_MINUTES_POSTFIX) );
- userData.setSeconds( (String) requestMap.get(clientId + ID_SECONDS_POSTFIX) );
+ if (type.equals("full") || type.equals("time"))
+ userData.setSeconds( (String) requestMap.get(clientId + ID_SECONDS_POSTFIX) );
}
inputDate.setSubmittedValue( userData );