Author: nbelaevski Date: 2008-08-04 18:30:44 -0400 (Mon, 04 Aug 2008) New Revision: 9903 Modified: trunk/ui/modal-panel/src/main/config/component/modalPanel.xml trunk/ui/modal-panel/src/main/java/org/richfaces/component/UIModalPanel.java trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/css/modalPanel.xcss trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx Log: https://jira.jboss.org/jira/browse/RF-4022 Modified: trunk/ui/modal-panel/src/main/config/component/modalPanel.xml =================================================================== --- trunk/ui/modal-panel/src/main/config/component/modalPanel.xml 2008-08-04 17:11:21 UTC (rev 9902) +++ trunk/ui/modal-panel/src/main/config/component/modalPanel.xml 2008-08-04 22:30:44 UTC (rev 9903) @@ -284,5 +284,11 @@ <name>converter</name> <classname>javax.faces.convert.Converter</classname> </property> + + <property> + <name>trimOverlayedElements</name> + <classname>boolean</classname> + <defaultvalue>true</defaultvalue> + </property> </component> </components> Modified: trunk/ui/modal-panel/src/main/java/org/richfaces/component/UIModalPanel.java =================================================================== --- trunk/ui/modal-panel/src/main/java/org/richfaces/component/UIModalPanel.java 2008-08-04 17:11:21 UTC (rev 9902) +++ trunk/ui/modal-panel/src/main/java/org/richfaces/component/UIModalPanel.java 2008-08-04 22:30:44 UTC (rev 9903) @@ -28,13 +28,10 @@ import javax.el.ValueExpression; import javax.faces.FacesException; import javax.faces.component.UIInput; -import javax.faces.context.FacesContext; import javax.faces.el.ValueBinding; import org.richfaces.json.JSONException; import org.richfaces.json.JSONMap; -import org.richfaces.skin.Skin; -import org.richfaces.skin.SkinFactory; /** * JSF component class @@ -90,6 +87,9 @@ public abstract String getTridentIVEngineSelectBehavior(); public abstract void setTridentIVEngineSelectBehavior(String tridentIVEngineSelectBehavior); + public abstract boolean isTrimOverlayedElements(); + public abstract void setTrimOverlayedElements(boolean trim); + public boolean getRendersChildren() { return true; } Modified: trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/css/modalPanel.xcss =================================================================== --- trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/css/modalPanel.xcss 2008-08-04 17:11:21 UTC (rev 9902) +++ trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/css/modalPanel.xcss 2008-08-04 22:30:44 UTC (rev 9903) @@ -5,6 +5,24 @@ xmlns="http://www.w3.org/1999/xhtml"> <f:verbatim> + .dr-mpnl-ovf-hd { + overflow: hidden; + } + + .dr-mpnl-trim { + position: relative; + z-index: 0; + } + + .dr-mpnl-iframe { + position: absolute; + left: 0px; + top: 0px; + background-color: white; + overflow-y: hidden; + z-index: -1; + } + .dr-mpnl-mask-div { position: fixed; top: 0; Modified: trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js =================================================================== --- trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js 2008-08-04 17:11:21 UTC (rev 9902) +++ trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js 2008-08-04 22:30:44 UTC (rev 9903) @@ -491,7 +491,7 @@ this.iframe = this.id.id + "IFrame"; new Insertion.Top(eCdiv, "<iframe src=\"javascript:''\" frameborder=\"0\" scrolling=\"no\" id=\"" + this.iframe + "\" " + - "style=\"position: absolute; width: 1px; height: 1px; background-color: white; overflow-y: hidden; z-index: -1;\">" + + "class=\"dr-mpnl-iframe\" style=\"width: 1px; height: 1px;\">" + "</iframe>"); eIframe = $(this.iframe); Modified: trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx =================================================================== --- trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx 2008-08-04 17:11:21 UTC (rev 9902) +++ trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx 2008-08-04 22:30:44 UTC (rev 9903) @@ -54,12 +54,13 @@ </div> <div class="dr-mpnl-panel rich-mpnl_panel" > - <div id="#{clientId}CDiv" style="position: absolute; left: 0px; top: 0px; z-index: 9; text-align: left;"> + <div id="#{clientId}CDiv" style="position: absolute; left: 0px; top: 0px; z-index: 9;"> + <div id="#{clientId}ShadowDiv" class="dr-mpnl-shadow rich-mpnl-shadow" style="#{component.shadowStyle}" > </div> - <c:object var="divStyle" type="java.lang.String" /> + <c:object var="divClass" type="java.lang.String" /> <c:object var="tableStyle" type="java.lang.String" /> <jsp:scriptlet> @@ -82,16 +83,26 @@ tableStyle += "width: " + (width > 0 ? width : 1) + "px;"; tableStyle += "height: " + (height > 0 ? height : 1) + "px;"; - divStyle = ""; - + divClass = ""; + } else { tableStyle = "height: 100%; width: 100%;"; - divStyle = "overflow: hidden;"; + /* + overflow: hidden; + */ + divClass = "dr-mpnl-ovf-hd"; + if (component.isTrimOverlayedElements()) { + /* + position: relative; + z-index: 0; + */ + divClass += " dr-mpnl-trim"; + } } ]]> </jsp:scriptlet> - <div id="#{clientId}ContentDiv" style="#{divStyle} #{component.attributes['style']}" class="dr-mpnl-pnl rich-mp-content"> + <div id="#{clientId}ContentDiv" style="#{component.attributes['style']}" class="#{divClass} dr-mpnl-pnl rich-mp-content"> <jsp:scriptlet> <![CDATA[if(component.getFacet("controls")!=null && component.getFacet("controls").isRendered()) {]]> </jsp:scriptlet> @@ -125,6 +136,7 @@ </td> </tr> </table> + </div> <jsp:scriptlet> <![CDATA[ @@ -149,8 +161,6 @@ ]]> </jsp:scriptlet> - - </div> </div> </div> <div class="dr-mpnl-mask-div dr-mpnl-mask-div-transparent rich-mpnl-mask-div" id="#{clientId}CursorDiv"