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

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

Author: vmolotkov
Date: 2008-02-19 08:49:17 -0500 (Tue, 19 Feb 2008)
New Revision: 6163

Modified:
   trunk/ui/combobox/src/main/java/org/richfaces/renderkit/ComboBoxBaseRenderer.java
   trunk/ui/combobox/src/main/templates/combobox.jspx
Log:
items conversation is corrected

Modified: trunk/ui/combobox/src/main/java/org/richfaces/renderkit/ComboBoxBaseRenderer.java
===================================================================
--- trunk/ui/combobox/src/main/java/org/richfaces/renderkit/ComboBoxBaseRenderer.java	2008-02-19 13:47:57 UTC (rev 6162)
+++ trunk/ui/combobox/src/main/java/org/richfaces/renderkit/ComboBoxBaseRenderer.java	2008-02-19 13:49:17 UTC (rev 6163)
@@ -199,11 +199,7 @@
 	}
 	
 	public String getItemsTextAsJSArray(FacesContext context, UIComponent component) {
-		String script = "";
-		if (valuesList != null) {
-			script = ScriptUtils.toScript(valuesList); 
-		}
-		return script; 
+		return ScriptUtils.toScript(valuesList); 
 	}
 		
 	public String getAsEventHandler(FacesContext context, UIComponent component, String attributeName) {

Modified: trunk/ui/combobox/src/main/templates/combobox.jspx
===================================================================
--- trunk/ui/combobox/src/main/templates/combobox.jspx	2008-02-19 13:47:57 UTC (rev 6162)
+++ trunk/ui/combobox/src/main/templates/combobox.jspx	2008-02-19 13:49:17 UTC (rev 6163)
@@ -210,7 +210,11 @@
 					   style="width:#{correction}; #{inputStyle}"
 					   autocomplete="off"
 					   />
-		<input id="comboBoxButtonBG#{clientId}" readonly="true" type="text" value="" class="rich-combobox-font-inactive rich-combobox-button-background rich-combobox-button-inactive"/>
+		<input id="comboBoxButtonBG#{clientId}" 
+			   readonly="true" 
+			   type="text" 
+			   value="" 
+			   class="rich-combobox-font-inactive rich-combobox-button-background rich-combobox-button-inactive"/>
 		<input id="comboboxButton#{clientId}" readonly="true" disabled="#{disabled}" type="text" value="" style="#{buttonStyle}; background-image: #{buttonIconNormal};" 
 					   class="rich-combobox-font-inactive rich-combobox-button-icon-inactive rich-combobox-button-inactive #{buttonDisabledClass}"/>
 		<div class="rich-combobox-strut rich-combobox-font" style="width:#{correction}">Strut</div>