[richfaces-svn-commits] JBoss Rich Faces SVN: r11519 - trunk/ui/inplaceInput/src/main/templates.

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

Author: abelevich
Date: 2008-12-03 09:40:36 -0500 (Wed, 03 Dec 2008)
New Revision: 11519

Modified:
   trunk/ui/inplaceInput/src/main/templates/inplaceinput.jspx
Log:
https://jira.jboss.org/jira/browse/RF-3233

Modified: trunk/ui/inplaceInput/src/main/templates/inplaceinput.jspx
===================================================================
--- trunk/ui/inplaceInput/src/main/templates/inplaceinput.jspx	2008-12-03 14:33:56 UTC (rev 11518)
+++ trunk/ui/inplaceInput/src/main/templates/inplaceinput.jspx	2008-12-03 14:40:36 UTC (rev 11519)
@@ -61,6 +61,22 @@
 	   	variables.setVariable("controlHoverClass", controlHoverClass);
 	   	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) {
@@ -75,12 +91,12 @@
 	   		   	
 	   	]]>
 	</jsp:scriptlet>
-		<span id="#{clientId}" class='rich-inplace rich-inplace-view #{component.attributes["styleClass"]}'
+		<span id="#{clientId}" class='rich-inplace rich-inplace-view #{viewClass}'
 			  x:passThruWithExclusions="id,styleClass,class" style="zoom: 1; #{component.attributes['style']}">
 	<jsp:scriptlet>
 	   	} else {
 	</jsp:scriptlet>
-		<div id="#{clientId}" class='rich-inplace rich-inplace-view #{component.attributes["viewClass"]} #{component.attributes["styleClass"]}'
+		<div id="#{clientId}" class='rich-inplace rich-inplace-view #{viewClass}'
 			  x:passThruWithExclusions="id,styleClass,class" style="zoom: 1; #{component.attributes['style']}">
 	<jsp:scriptlet>
 	   	} 
@@ -168,14 +184,14 @@
 			var inplaceInputUserStyles = {
 					component:{
 						view :{
-							normal:'#{component.attributes["viewClass"]}', 
+							normal:'#{viewClass}', 
 							hovered:'#{component.attributes["viewHoverClass"]}' 
 						},
 						changed:{
-							normal:'#{component.attributes["changedClass"]}',
+							normal:'#{changedClass}',
 							hovered:'#{component.attributes["changedHoverClass"]}'
 						},
-						editable:'#{component.attributes["editClass"]}'
+						editable:'#{editClass}'
 						 
 					}
 			};