[richfaces-svn-commits] JBoss Rich Faces SVN: r16641 - in branches/community/3.3.X/ui/combobox/src/main: templates and 1 other directory.

Author: amarkhel Date: 2010-03-19 17:00:58 -0400 (Fri, 19 Mar 2010) New Revision: 16641 Modified: branches/community/3.3.X/ui/combobox/src/main/java/org/richfaces/renderkit/ComboBoxBaseRenderer.java branches/community/3.3.X/ui/combobox/src/main/templates/combobox.jspx Log: RF-8500 Modified: branches/community/3.3.X/ui/combobox/src/main/java/org/richfaces/renderkit/ComboBoxBaseRenderer.java =================================================================== --- branches/community/3.3.X/ui/combobox/src/main/java/org/richfaces/renderkit/ComboBoxBaseRenderer.java 2010-03-19 20:59:38 UTC (rev 16640) +++ branches/community/3.3.X/ui/combobox/src/main/java/org/richfaces/renderkit/ComboBoxBaseRenderer.java 2010-03-19 21:00:58 UTC (rev 16641) @@ -104,6 +104,10 @@ return values; } + public String getReadOnlyValue(Object enableManualInput){ + return (Boolean)enableManualInput ? "readonly" : ""; + } + public List<Object> encodeSuggestionValues(FacesContext context, UIComboBox combobox) throws IOException, IllegalArgumentException { List<Object> values = new ArrayList<Object>(); Modified: branches/community/3.3.X/ui/combobox/src/main/templates/combobox.jspx =================================================================== --- branches/community/3.3.X/ui/combobox/src/main/templates/combobox.jspx 2010-03-19 20:59:38 UTC (rev 16640) +++ branches/community/3.3.X/ui/combobox/src/main/templates/combobox.jspx 2010-03-19 21:00:58 UTC (rev 16641) @@ -120,7 +120,7 @@ name="#{clientId}comboboxField" disabled="#{disabled}" class="#{valueStyle} rich-combobox-input-inactive #{component.attributes['inputInactiveClass']}" type="text" - readonly="#{enableManualInput}" + readonly="#{this:getReadOnlyValue(enableManualInput)}" value="#{value}" x:onblur="#{component.attributes['onblur']}" onfocus = "#{component.attributes['onfocus']}" @@ -130,13 +130,13 @@ /> <input id="#{clientId}comboBoxButtonBG" tabindex="-1" - readonly="true" + readonly="readonly" type="text" value="" class="rich-combobox-font-inactive rich-combobox-button-background rich-combobox-button-inactive"/> <input id="#{clientId}comboboxButton" tabindex="-1" - readonly="true" + readonly="readonly" disabled="#{disabled}" type="text" value=""