Author: akushunin Date: 2007-11-29 07:01:11 -0500 (Thu, 29 Nov 2007) New Revision: 4344 Modified: trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx Log: RF-1450 Modified: trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx =================================================================== --- trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2007-11-29 11:21:10 UTC (rev 4343) +++ trunk/ui/calendar/src/main/templates/org/richfaces/htmlCalendar.jspx 2007-11-29 12:01:11 UTC (rev 4344) @@ -24,9 +24,7 @@ } else { boolean disabled = getUtils().isBooleanAttribute(component, "disabled"); boolean showInput = getUtils().isBooleanAttribute(component, "showInput"); - boolean manualInput = getUtils().isBooleanAttribute(component, "enableManualInput"); - variables.setVariable("manualInput",new Boolean(!manualInput)); - String onfieldclick =null; + String onfieldclick =null; String type="text"; if (!showInput){ type="hidden"; @@ -43,7 +41,7 @@ var="disabledIcon" /> <input id="#{clientId}InputDate" name="#{clientId}InputDate" value="#{this:getInputValue(context,component)}" type="#{type}" - readonly="#{manualInput}" disabled="#{disabled}" + disabled="#{disabled}" accesskey="#{component.attributes['accesskey']}" maxlength="#{component.attributes['maxlength']}" onchange="#{component.attributes['oninputchange']}" @@ -57,7 +55,17 @@ size="#{component.attributes['inputSize']}" style="vertical-align: middle; #{component.attributes['inputStyle']}" class="rich-calendar-input #{component.attributes['inputClass']}" - tabindex="#{component.attributes['tabindex']}"> </input> <jsp:scriptlet> + tabindex="#{component.attributes['tabindex']}"> + <jsp:scriptlet> + <![CDATA[ + boolean manualInput = getUtils().isBooleanAttribute(component, "enableManualInput"); + if(!manualInput){ + getUtils().writeAttribute(writer, "readonly", "readonly"); + } + ]]> + </jsp:scriptlet> + + </input> <jsp:scriptlet> <![CDATA[ String buttonIcon = org.richfaces.component.util.ViewUtil.getResourceURL((String) component.getAttributes().get("buttonIcon"),context); String buttonIconDisabled = org.richfaces.component.util.ViewUtil.getResourceURL((String) component.getAttributes().get("buttonIconDisabled"),context);