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

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

Author: abelevich
Date: 2008-12-03 09:41:13 -0500 (Wed, 03 Dec 2008)
New Revision: 11520

Modified:
   trunk/ui/inplaceSelect/src/main/java/org/richfaces/renderkit/InplaceSelectBaseRenderer.java
   trunk/ui/inplaceSelect/src/main/templates/inplaceselect.jspx
Log:
https://jira.jboss.org/jira/browse/RF-3233

Modified: trunk/ui/inplaceSelect/src/main/java/org/richfaces/renderkit/InplaceSelectBaseRenderer.java
===================================================================
--- trunk/ui/inplaceSelect/src/main/java/org/richfaces/renderkit/InplaceSelectBaseRenderer.java	2008-12-03 14:40:36 UTC (rev 11519)
+++ trunk/ui/inplaceSelect/src/main/java/org/richfaces/renderkit/InplaceSelectBaseRenderer.java	2008-12-03 14:41:13 UTC (rev 11520)
@@ -27,7 +27,6 @@
 
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
-import javax.faces.context.ResponseWriter;
 import javax.faces.model.SelectItem;
 
 import org.ajax4jsf.util.InputUtils;

Modified: trunk/ui/inplaceSelect/src/main/templates/inplaceselect.jspx
===================================================================
--- trunk/ui/inplaceSelect/src/main/templates/inplaceselect.jspx	2008-12-03 14:40:36 UTC (rev 11519)
+++ trunk/ui/inplaceSelect/src/main/templates/inplaceselect.jspx	2008-12-03 14:41:13 UTC (rev 11520)
@@ -67,6 +67,23 @@
 	   	variables.setVariable("controlHoveredClass", controlHoveredClass);
 	   	String controlPressedClass = (String)component.getAttributes().get("controlPressedClass"); 
 	   	variables.setVariable("controlPressedClass", controlPressedClass);
+	   	
+	   	String styleClass = (String)component.getAttributes().get("styleClass");
+	   	styleClass = styleClass != null ? styleClass.trim() : "";
+	   	variables.setVariable("styleClass", styleClass);
+	   	
+	   	String changedClass = (String)component.getAttributes().get("changedClass");
+	   	changedClass = (changedClass != null ? changedClass.trim() : "") + styleClass;
+	   	variables.setVariable("changedClass", changedClass);
+	   	
+	   	String viewClass = (String)component.getAttributes().get("viewClass");
+	   	viewClass = (viewClass != null ? viewClass.trim() : "") + styleClass;
+	   	variables.setVariable("viewClass", viewClass);
+	   	
+	   	String editClass = (String)component.getAttributes().get("editClass");
+	   	editClass = (editClass != null ? editClass.trim() : "") + styleClass;
+	   	variables.setVariable("editClass", editClass);
+	   	
 	   	String layout = (String)component.getAttributes().get("layout");
 	   	
 	   	if (layout != null && layout.length() != 0) {
@@ -85,11 +102,11 @@
 <jsp:scriptlet>
 	if (layout.equals("inline")) {	
 </jsp:scriptlet>
-		<span id="#{clientId}" class="rich-inplace-select rich-inplace-select-view #{component.attributes['viewClass']}"  x:passThruWithExclusions="id,styleClass,class" style="zoom: 1; #{component.attributes['style']}">
+		<span id="#{clientId}" class="rich-inplace-select rich-inplace-select-view #{viewClass}"  x:passThruWithExclusions="id,styleClass,class" style="zoom: 1; #{component.attributes['style']}">
 <jsp:scriptlet>
 	} else {	
 </jsp:scriptlet>
-		<div id="#{clientId}" class="rich-inplace-select rich-inplace-select-view #{component.attributes['viewClass']}"  x:passThruWithExclusions="id,styleClass,class" style="zoom: 1; #{component.attributes['style']}">
+		<div id="#{clientId}" class="rich-inplace-select rich-inplace-select-view #{viewClass}"  x:passThruWithExclusions="id,styleClass,class" style="zoom: 1; #{component.attributes['style']}">
 <jsp:scriptlet>
 	} 	
 </jsp:scriptlet>	  
@@ -200,6 +217,8 @@
 					</div>
 				</div>
 			</div>
+			
+			
 			<script type="text/javascript">
 				
 				
@@ -211,9 +230,9 @@
 					},
 					
 					component: {
-						changed :{normal:'#{component.attributes["changedClass"]}',hovered:'#{component.attributes["changedHoverClass"]}'}, 
-						view : {normal:'#{component.attributes["viewClass"]}',hovered:'#{component.attributes["viewHoverClass"]}'}, 
-						editable:'#{component.attributes["editClass"]}'
+						changed :{normal:'#{changedClass}' ,hovered:'#{component.attributes["changedHoverClass"]}'}, 
+						view : {normal:'#{viewClass}',hovered:'#{component.attributes["viewHoverClass"]}'}, 
+						editable:'#{editClass}'
 					}
 				};