Author: dmorozov
Date: 2008-11-26 10:39:00 -0500 (Wed, 26 Nov 2008)
New Revision: 11400
Modified:
trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js
trunk/ui/combobox/src/main/templates/combobox.jspx
Log:
https://jira.jboss.org/jira/browse/RF-5056
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-11-26
15:38:10 UTC (rev 11399)
+++
trunk/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js 2008-11-26
15:39:00 UTC (rev 11400)
@@ -36,6 +36,9 @@
if (item) {
this.comboList.doSelectItem(item);
}
+ // RF-5056
+ this.comboValue.value = value;
+
} else {
if (this.defaultMessage) {
this.applyDefaultText();
Modified: trunk/ui/combobox/src/main/templates/combobox.jspx
===================================================================
--- trunk/ui/combobox/src/main/templates/combobox.jspx 2008-11-26 15:38:10 UTC (rev
11399)
+++ trunk/ui/combobox/src/main/templates/combobox.jspx 2008-11-26 15:39:00 UTC (rev
11400)
@@ -92,8 +92,8 @@
value = getConvertedStringValue(context, component,value);
if ("".equals(value)) {
valueStyle = "rich-combobox-font-disabled";
- value = defaultLabel;
- }
+ //value = defaultLabel;
+ }
variables.setVariable("value", value);
String convertedValue = encodeValue((String)value);
variables.setVariable("convertedValue", convertedValue);
@@ -265,7 +265,7 @@
variables.setVariable("hiddenValue", value);
]]>
</jsp:scriptlet>
- <input id="#{clientId}comboboxValue" name="#{clientId}"
type="hidden" value="#{hiddenValue}"/>
+ <input id="#{clientId}comboboxValue" name="#{clientId}"
type="hidden"/>
</div>