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 2006/02/19 22:40:29 UTC
svn commit: r378960 - in /myfaces/tomahawk/trunk/core/src/main:
java/org/apache/myfaces/custom/calendar/ tld/
Author: mmarinschek
Date: Sun Feb 19 13:40:29 2006
New Revision: 378960
URL: http://svn.apache.org/viewcvs?rev=378960&view=rev
Log:
displayValueOnly Attributes for inputCalendar
Modified:
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/calendar/HtmlInputCalendar.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/calendar/HtmlInputCalendarTag.java
myfaces/tomahawk/trunk/core/src/main/tld/tomahawk.tld
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/calendar/HtmlCalendarRenderer.java?rev=378960&r1=378959&r2=378960&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 Sun Feb 19 13:40:29 2006
@@ -180,18 +180,21 @@
timeKeeper.getFirstDayOfWeek(),inputCalendar,calendarVar)+"\n",null);
writer.writeText(calendarVar+".init(document.getElementById('"+
inputCalendar.getClientId(facesContext)+"Span"+"'));\n",null);
- writer.writeText(getScriptBtn(facesContext, inputCalendar,
- dateFormat,inputCalendar.getPopupButtonString(), new FunctionCallProvider(){
- public String getFunctionCall(FacesContext facesContext, UIComponent uiComponent, String dateFormat)
- {
- String clientId = uiComponent.getClientId(facesContext);
+ if(!inputCalendar.isDisplayValueOnly())
+ {
+ writer.writeText(getScriptBtn(facesContext, inputCalendar,
+ dateFormat,inputCalendar.getPopupButtonString(), new FunctionCallProvider(){
+ public String getFunctionCall(FacesContext facesContext, UIComponent uiComponent, String dateFormat)
+ {
+ String clientId = uiComponent.getClientId(facesContext);
- String clientVar = JavascriptUtils.getValidJavascriptName(clientId+"CalendarVar",true);
+ String clientVar = JavascriptUtils.getValidJavascriptName(clientId+"CalendarVar",true);
- return clientVar+"._popUpCalendar(this,document.getElementById(\\'"+clientId+"\\'),\\'"+dateFormat+"\\')";
- }
- })+"\n",null);
- writer.endElement(HTML.SCRIPT_ELEM);
+ return clientVar+"._popUpCalendar(this,document.getElementById(\\'"+clientId+"\\'),\\'"+dateFormat+"\\')";
+ }
+ })+"\n",null);
+ }
+ writer.endElement(HTML.SCRIPT_ELEM);
}
}
else
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/calendar/HtmlInputCalendar.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/calendar/HtmlInputCalendar.java?rev=378960&r1=378959&r2=378960&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/calendar/HtmlInputCalendar.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/calendar/HtmlInputCalendar.java Sun Feb 19 13:40:29 2006
@@ -16,9 +16,9 @@
package org.apache.myfaces.custom.calendar;
import org.apache.myfaces.component.UserRoleUtils;
+import org.apache.myfaces.component.html.ext.HtmlInputText;
import org.apache.myfaces.util._ComponentUtils;
-import javax.faces.component.html.HtmlInputText;
import javax.faces.context.FacesContext;
import javax.faces.el.ValueBinding;
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/calendar/HtmlInputCalendarTag.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/calendar/HtmlInputCalendarTag.java?rev=378960&r1=378959&r2=378960&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/calendar/HtmlInputCalendarTag.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/calendar/HtmlInputCalendarTag.java Sun Feb 19 13:40:29 2006
@@ -17,6 +17,7 @@
import org.apache.myfaces.component.UserRoleAware;
import org.apache.myfaces.taglib.html.HtmlInputTagBase;
+import org.apache.myfaces.taglib.html.ext.HtmlInputTextTag;
import org.apache.myfaces.renderkit.html.HTML;
import javax.faces.component.UIComponent;
@@ -26,7 +27,7 @@
* @version $Revision$ $Date$
*/
public class HtmlInputCalendarTag
- extends HtmlInputTagBase
+ extends HtmlInputTextTag
{
private String _accesskey;
private String _align;
Modified: myfaces/tomahawk/trunk/core/src/main/tld/tomahawk.tld
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/core/src/main/tld/tomahawk.tld?rev=378960&r1=378959&r2=378960&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/tld/tomahawk.tld (original)
+++ myfaces/tomahawk/trunk/core/src/main/tld/tomahawk.tld Sun Feb 19 13:40:29 2006
@@ -615,6 +615,7 @@
&ext_forceId_attribute;
&tomahawk_input_calendar_attributes;
&alt_location_attributes;
+ &display_value_only_attributes;
</tag>
<!-- jsValueChangeListener -->