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

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

Author: abelevich
Date: 2007-12-28 10:44:39 -0500 (Fri, 28 Dec 2007)
New Revision: 5080

Modified:
   trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/ComboBoxBaseRenderer.java
   trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx
Log:
remove encode script

Modified: trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/ComboBoxBaseRenderer.java
===================================================================
--- trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/ComboBoxBaseRenderer.java	2007-12-28 15:25:00 UTC (rev 5079)
+++ trunk/sandbox/ui/combobox/src/main/java/org/richfaces/renderkit/ComboBoxBaseRenderer.java	2007-12-28 15:44:39 UTC (rev 5080)
@@ -20,13 +20,13 @@
  *
  */
 public class ComboBoxBaseRenderer extends HeaderResourcesRendererBase {
-
-	private static final String INPUT = "_input";
+//
+//	private static final String INPUT = "_input";
+//	
+//	private static final String BUTTON = "_button";
+//	
+//	private static final String POPUP = "_popup";
 	
-	private static final String BUTTON = "_button";
-	
-	private static final String POPUP = "_popup";
-	
 	protected Class<UIComboBox>  getComponentClass() {
 		return UIComboBox.class;
 	}
@@ -72,7 +72,7 @@
 		writer.endElement(HTML.DIV_ELEM);
 	}
 	
-	private String encodeScript(FacesContext context, UIComponent component, String popupId){
+	/*private String encodeScript(FacesContext context, UIComponent component, String popupId){
 		UIComboBox comboBox = (UIComboBox) component;
 		
 		JSFunction function = new JSFunction("new Richfaces.ComboBox");
@@ -86,5 +86,5 @@
 		function.addParameter(options);
 		
 		return (function.toString() + ";");
-	}
+	}*/
 }

Modified: trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx
===================================================================
--- trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx	2007-12-28 15:25:00 UTC (rev 5079)
+++ trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx	2007-12-28 15:44:39 UTC (rev 5080)
@@ -10,7 +10,8 @@
 	class="org.richfaces.renderkit.html.ComboBoxRenderer"
 	component="org.richfaces.component.UIComboBox"> 
 	
-	<h:styles>css/combobox.xcss</h:styles> 
+	<h:styles>css/combobox.xcss</h:styles>
+	<f:resource name="org.richfaces.renderkit.images.ComboBoxImage" var="combo_img" /> 
 	<h:scripts>
 			new org.ajax4jsf.javascript.PrototypeScript(),
 			scripts/combobox.js
@@ -22,7 +23,7 @@
 	 <div id="#{clientId}">
 		<div id="comboboxControl#{clientId}" class="" style="position:relative;">
 			<input id="comboboxField#{clientId}" class="" type="text" size="20" autocomplete="off"/>
-			<img id="comboboxButton#{clientId}" class="" style="position:absolute; top:0pt; border:1px solid black; height:22px;width:22px;" src="#{down_arrow}"/>
+			<img id="comboboxButton#{clientId}" class="" style="position:absolute; top:0pt; border:1px solid black;" src="#{combo_img}"/>
 		</div>
 		<div id="list#{clientId}" style="display:none" class="rich-combobox-list">
 			<f:call name="encodeItems"/>