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

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

Author: amarkhel
Date: 2010-08-26 10:10:54 -0400 (Thu, 26 Aug 2010)
New Revision: 18988

Modified:
   trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PopupPanelBaseRenderer.java
   trunk/ui/output/ui/src/main/templates/popupPanel.template.xml
Log:
RF-9133

Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PopupPanelBaseRenderer.java
===================================================================
--- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PopupPanelBaseRenderer.java	2010-08-26 09:53:30 UTC (rev 18987)
+++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/PopupPanelBaseRenderer.java	2010-08-26 14:10:54 UTC (rev 18988)
@@ -155,7 +155,10 @@
 
             result.append("});");
         }
-        return result.toString();
+        if (result.length() > 0) {
+            return result.toString();
+        }
+        return null;
     }
 
     public String getStyleIfTrimmed(UIComponent panel){

Modified: trunk/ui/output/ui/src/main/templates/popupPanel.template.xml
===================================================================
--- trunk/ui/output/ui/src/main/templates/popupPanel.template.xml	2010-08-26 09:53:30 UTC (rev 18987)
+++ trunk/ui/output/ui/src/main/templates/popupPanel.template.xml	2010-08-26 14:10:54 UTC (rev 18988)
@@ -70,8 +70,7 @@
 		</c:if>
 		
 	</div>
-</div>
-<cdk:object type="java.lang.String" name="script" value="#{buildScript(facesContext, component)}" />
+	<cdk:object type="java.lang.String" name="script" value="#{buildScript(facesContext, component)}" />
 	<cdk:object type="java.lang.String" name="showScript" value="#{buildShowScript(facesContext, component)}" />
 			<script type="text/javascript">	
 				#{script}
@@ -81,7 +80,9 @@
 				#{showScript}
 			</script>
 			</c:if>
+</div>
 
 
+
 	</cc:implementation>
 </cdk:root>
\ No newline at end of file