[richfaces-svn-commits] JBoss Rich Faces SVN: r5267 - in trunk/sandbox/ui/combobox/src/main: templates and 1 other directory.

[richfaces-svn-commits at lists.jboss.org]

Author: abelevich
Date: 2008-01-10 09:33:35 -0500 (Thu, 10 Jan 2008)
New Revision: 5267

Modified:
   trunk/sandbox/ui/combobox/src/main/config/component/combobox.xml
   trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx
Log:
rename disable->disabled, add encoding input value attribute 

Modified: trunk/sandbox/ui/combobox/src/main/config/component/combobox.xml
===================================================================
--- trunk/sandbox/ui/combobox/src/main/config/component/combobox.xml	2008-01-10 14:30:18 UTC (rev 5266)
+++ trunk/sandbox/ui/combobox/src/main/config/component/combobox.xml	2008-01-10 14:33:35 UTC (rev 5267)
@@ -102,7 +102,7 @@
 		    	<defaultvalue><![CDATA[""]]></defaultvalue>
 		    </property>
 		    <property>
-		    	<name>disable</name>
+		    	<name>disabled</name>
 		    	<classname>boolean</classname>
 		        <description>make component disabled</description>
 		    	<defaultvalue>false</defaultvalue>

Modified: trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx
===================================================================
--- trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx	2008-01-10 14:30:18 UTC (rev 5266)
+++ trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx	2008-01-10 14:33:35 UTC (rev 5267)
@@ -49,13 +49,20 @@
 	    	
 	    	Boolean selectFirstOnUpdate = (Boolean) component.getAttributes().get("selectFirstOnUpdate");
 	        variables.setVariable("selectFirstOnUpdate", selectFirstOnUpdate);
+	        
+	    	Object value = component.getAttributes().get("value");
+	    	if (value != null) {
+	    		value = getConvertedStringValue(context, component,value);
+	    	}
+	    	variables.setVariable("value", value);
+
     		
     		
 		]]>
     </jsp:scriptlet>
 			                					
 	<div id="#{clientId}" class="rich-combobox-font rich-combobox-shell" style="width:#{listWidth}">
-		<input id="comboboxField#{clientId}" class="rich-combobox-font rich-combobox-input-default rich-combobox-input" type="text" size="#{inputSize}" autocomplete="off" style="width:#{listWidth}">
+		<input id="comboboxField#{clientId}" class="rich-combobox-font rich-combobox-input-default rich-combobox-input" type="text" value="#{value}" size="#{inputSize}" autocomplete="off" style="width:#{listWidth}">
 		</input>
 		<input id="comboBoxButtonBG#{clientId}" readonly="true" type="text" value="" class="rich-combobox-font rich-combobox-button-background rich-combobox-button">
 		</input>