Author: abelevich Date: 2011-02-03 13:18:09 -0500 (Thu, 03 Feb 2011) New Revision: 21426 Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/DropDownMenuRendererBase.java trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/dropdownmenu.ecss trunk/ui/output/ui/src/main/templates/dropdownmenu.template.xml Log: https://issues.jboss.org/browse/RF-10305 Drop down menu: attribute disabled doesn't work Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/DropDownMenuRendererBase.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/DropDownMenuRendererBase.java 2011-02-03 18:01:17 UTC (rev 21425) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/DropDownMenuRendererBase.java 2011-02-03 18:18:09 UTC (rev 21426) @@ -66,10 +66,8 @@ UIComponent facet = null; AbstractDropDownMenu ddmenu = (AbstractDropDownMenu) component; if (ddmenu != null) { - - if (ddmenu.isDisabled()) { - facet = ddmenu.getFacet(AbstractDropDownMenu.Facets.labelDisabled.toString()); - } else { + facet = ddmenu.getFacet(AbstractDropDownMenu.Facets.labelDisabled.toString()); + if (!ddmenu.isDisabled() || facet == null) { facet = ddmenu.getFacet(AbstractDropDownMenu.Facets.label.toString()); } } Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/dropdownmenu.ecss =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/dropdownmenu.ecss 2011-02-03 18:01:17 UTC (rev 21425) +++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/dropdownmenu.ecss 2011-02-03 18:18:09 UTC (rev 21426) @@ -18,6 +18,11 @@ left:0; position:absolute; } + +.rf-ddm-dis { + color:'#{richSkin.tabDisabledTextColor}'; /* #8DB7F3*/ + cursor: default; +} .rf-ddm-lbl-dec { font-weight:bold; cursor : pointer; Modified: trunk/ui/output/ui/src/main/templates/dropdownmenu.template.xml =================================================================== --- trunk/ui/output/ui/src/main/templates/dropdownmenu.template.xml 2011-02-03 18:01:17 UTC (rev 21425) +++ trunk/ui/output/ui/src/main/templates/dropdownmenu.template.xml 2011-02-03 18:18:09 UTC (rev 21426) @@ -21,7 +21,7 @@ <cdk:object name="label" value="#{getLabelFacet(facesContext, component)}" type="javax.faces.component.UIComponent" /> <cdk:object name="isDisabled" type="boolean" value="#{isDisabled(facesContext, component)}" /> - <div id="#{clientId}" class="rf-ddm-lbl #{isDisabled ? 'rf-ddm-lbl-dis' : 'rf-ddm-lbl-unsel '+styleClass} " style="#{style}" + <div id="#{clientId}" class="rf-ddm-lbl #{isDisabled ? 'rf-ddm-dis' : 'rf-ddm-lbl-unsel '+styleClass} " style="#{style}" cdk:passThroughWithExclusions=""> <div id="#{clientId}_label" class="#{isDisabled ? 'rf-ddm-lbl-dis' : 'rf-ddm-lbl-dec'}"> @@ -36,7 +36,6 @@ </c:otherwise> </c:choose> - </div> <c:if test="#{not isDisabled(facesContext, component)}">