From richfaces-svn-commits at lists.jboss.org Wed Dec 26 08:53:48 2007
Content-Type: multipart/mixed; boundary="===============5274821469960438932=="
MIME-Version: 1.0
From: richfaces-svn-commits at lists.jboss.org
To: richfaces-svn-commits at lists.jboss.org
Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r5006 - in
 trunk/ui/modal-panel/src/main: templates/org/richfaces and 1 other directory.
Date: Wed, 26 Dec 2007 08:53:48 -0500
Message-ID: <E1J7Whg-0001nO-6h@committer01.frg.pub.inap.atl.jboss.com>

--===============5274821469960438932==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: sergeyhalipov
Date: 2007-12-26 08:53:48 -0500 (Wed, 26 Dec 2007)
New Revision: 5006

Modified:
   trunk/ui/modal-panel/src/main/java/org/richfaces/renderkit/ModalPanelRen=
dererBase.java
   trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx
Log:
http://jira.jboss.com/jira/browse/RF-1654

Modified: trunk/ui/modal-panel/src/main/java/org/richfaces/renderkit/ModalP=
anelRendererBase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/ui/modal-panel/src/main/java/org/richfaces/renderkit/ModalPanelRe=
ndererBase.java	2007-12-26 06:03:57 UTC (rev 5005)
+++ trunk/ui/modal-panel/src/main/java/org/richfaces/renderkit/ModalPanelRe=
ndererBase.java	2007-12-26 13:53:48 UTC (rev 5006)
@@ -160,4 +160,27 @@
 	public void writeEventHandlerFunction(FacesContext context, UIComponent c=
omponent, String eventName) throws IOException{
 		RendererUtils.writeEventHandlerFunction(context, component, eventName);
 	}
+	=

+	public String getContentStyle(FacesContext context, UIModalPanel panel) {
+		StringBuffer result =3D new StringBuffer();
+		=

+		result.append("overflow: hidden; ");
+		=

+		String style =3D (String)panel.getAttributes().get("style");
+		if (null !=3D style && !"".equals(style)) {
+			result.append(style).
+				append(" ");
+			=

+		}
+		int minHeight =3D panel.getMinHeight();
+		int minWidth =3D panel.getMinWidth();
+		if (minWidth > -1) {
+			result.append("min-width: " + minWidth + "; ");
+		}
+		if (minHeight > -1) {
+			result.append("min-height: " + minHeight + "; ");
+		}
+		=

+		return result.toString();
+	}
 }

Modified: trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPa=
nel.jspx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.js=
px	2007-12-26 06:03:57 UTC (rev 5005)
+++ trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.js=
px	2007-12-26 13:53:48 UTC (rev 5006)
@@ -73,7 +73,7 @@
 					style=3D"#{component.shadowStyle}" >
 			   	</div>
 				<table id=3D"#{clientId}ContentTable" cellpadding=3D"0" cellspacing=3D=
"0" border=3D"0" style=3D"position: absolute; z-index: 2;"><tbody><tr><td c=
lass=3D"dr-mpnl-pnl">
-				<div id=3D"#{clientId}ContentDiv" style=3D"overflow: hidden; #{compone=
nt.attributes['style']}" class=3D"rich-mp-content">
+				<div id=3D"#{clientId}ContentDiv" style=3D"#{this:getContentStyle(cont=
ext, component)}" class=3D"rich-mp-content">
 						=

 					<a href=3D"#" class=3D"dr-mpnl-pnl-a" id=3D"#{clientId}FirstHref" >_<=
/a>
 			        <table style=3D"height: 100%; width: 100%;" border=3D"0" cellpa=
dding=3D"0" cellspacing=3D"0">


--===============5274821469960438932==--