Author: abelevich Date: 2008-05-08 09:25:12 -0400 (Thu, 08 May 2008) New Revision: 8498 Modified: trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js trunk/ui/combobox/src/main/templates/combobox.jspx Log: http://jira.jboss.com/jira/browse/RF-3285 Modified: trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js =================================================================== --- trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js 2008-05-08 13:21:48 UTC (rev 8497) +++ trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js 2008-05-08 13:25:12 UTC (rev 8498) @@ -337,13 +337,15 @@ this.button.style.backgroundImage = iconStyles.ACTIVE; this.field.className = this.classes.FIELD.CLASSES.ACTIVE; - this.isDisabled = false; + Element.setStyle(this.field, this.classes.FIELD.STYLE.ACTIVE); + this.isDisabled = false; }, doDisable : function() { this.button.className = this.classes.BUTTON.CLASSES.DISABLED; this.buttonBG.className = this.classes.BUTTONBG.CLASSES.DISABLED; this.field.className = this.classes.FIELD.CLASSES.DISABLED; + Element.setStyle(this.field, this.classes.FIELD.STYLE.DISABLED); var iconStyles = this.classes.BUTTONICON.STYLE; this.button.style.backgroundImage = iconStyles.DISABLED; @@ -351,6 +353,7 @@ this.button.disabled = true; this.field.disabled = true; + this.isDisabled = true; }, @@ -358,6 +361,7 @@ this.button.className = this.classes.BUTTON.CLASSES.NORMAL; this.buttonBG.className = this.classes.BUTTONBG.CLASSES.NORMAL; this.field.className = this.classes.FIELD.CLASSES.NORMAL; + Element.setStyle(this.field, this.classes.FIELD.STYLE.NORMAL); var iconStyles = this.classes.BUTTONICON.STYLE; this.button.style.backgroundImage = iconStyles.NORMAL; Modified: trunk/ui/combobox/src/main/templates/combobox.jspx =================================================================== --- trunk/ui/combobox/src/main/templates/combobox.jspx 2008-05-08 13:21:48 UTC (rev 8497) +++ trunk/ui/combobox/src/main/templates/combobox.jspx 2008-05-08 13:25:12 UTC (rev 8498) @@ -210,11 +210,11 @@ <input id="#{clientId}comboboxField" name="#{clientId}comboboxField" disabled="#{disabled}" - class="#{valueStyle} rich-combobox-input-inactive #{inputDisabledClass}" type="text" + class="#{valueStyle} rich-combobox-input-inactive #{inputInactiveClass}" type="text" readonly="#{enableManualInput}" value="#{value}" onblur="#{component.attributes['onblur']}" - style="width:#{correction}; #{inputStyle}" + style="width:#{correction}; #{inputInactiveStyle}" autocomplete="off" tabindex="#{component.attributes['tabindex']}" /> @@ -224,7 +224,7 @@ value="" class="rich-combobox-font-inactive rich-combobox-button-background rich-combobox-button-inactive"/> <input id="#{clientId}comboboxButton" readonly="true" disabled="#{disabled}" type="text" value="" style="#{buttonStyle}; background-image: #{buttonIconInactive};" - class="rich-combobox-font-inactive rich-combobox-button-icon-inactive rich-combobox-button-inactive #{buttonDisabledClass}"/> + class="rich-combobox-font-inactive rich-combobox-button-icon-inactive rich-combobox-button-inactive #{buttonInactiveClass}"/> <div class="rich-combobox-strut rich-combobox-font" style="width:#{correction}">Strut</div> </div> @@ -303,7 +303,7 @@ ACTIVE : "rich-combobox-font rich-combobox-input #{inputClass}", DISABLED : "rich-combobox-font-disabled rich-combobox-input-disabled #{inputDisabledClass}"}, STYLE : - {NORMAL : "#{inputStyle}", + {NORMAL : "#{inputInactiveStyle}", ACTIVE : "#{inputStyle}", DISABLED : "#{inputDisabledStyle}"} },