Author: pyaschenko
Date: 2009-02-11 13:19:42 -0500 (Wed, 11 Feb 2009)
New Revision: 12632
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/scripts/modalPanel.js
trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx
Log:
https://jira.jboss.org/jira/browse/RF-6078
Modified: trunk/ui/modal-panel/src/main/config/component/modalPanel.xml
===================================================================
--- trunk/ui/modal-panel/src/main/config/component/modalPanel.xml 2009-02-11 17:08:54 UTC
(rev 12631)
+++ trunk/ui/modal-panel/src/main/config/component/modalPanel.xml 2009-02-11 18:19:42 UTC
(rev 12632)
@@ -188,6 +188,12 @@
<description> If "true" modalPanel should be autosizeable.
Default value is "false". </description>
<defaultvalue>false</defaultvalue>
</property>
+ <property>
+ <name>overlapEmbedObjects</name>
+ <classname>boolean</classname>
+ <description> If "true" modalPanel creates iframe to overlap
embed objects like PDF on a page. Default value is "false".
</description>
+ <defaultvalue>false</defaultvalue>
+ </property>
<property hidden="true" >
<name>requiredMessage</name>
<classname>java.lang.String</classname>
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 2009-02-11
17:08:54 UTC (rev 12631)
+++
trunk/ui/modal-panel/src/main/java/org/richfaces/component/UIModalPanel.java 2009-02-11
18:19:42 UTC (rev 12632)
@@ -93,6 +93,9 @@
public abstract String getDomElementAttachment();
public abstract void setDomElementAttachment(String domElementAttachment);
+ public abstract boolean isOverlapEmbedObjects();
+ public abstract void setOverlapEmbedObjects(boolean overlapEmbedObjects);
+
public boolean getRendersChildren() {
return true;
}
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 2009-02-11
17:08:54 UTC (rev 12631)
+++
trunk/ui/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js 2009-02-11
18:19:42 UTC (rev 12632)
@@ -540,7 +540,7 @@
}
var eIframe;
- if (ModalPanel.disableSelects && !this.iframe) {
+ if ((ModalPanel.disableSelects || this.options.overlapEmbedObjects) &&
!this.iframe) {
this.iframe = this.id.id + "IFrame";
new Insertion.Top(eCdiv,
"<iframe src=\"javascript:''\"
frameborder=\"0\" scrolling=\"no\" id=\"" + 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 2009-02-11
17:08:54 UTC (rev 12631)
+++ trunk/ui/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx 2009-02-11
18:19:42 UTC (rev 12632)
@@ -197,7 +197,8 @@
showWhenRendered: #{component.showWhenRendered},
selectBehavior: "#{component.tridentIVEngineSelectBehavior}",
- autosized: #{component.autosized}
+ autosized: #{component.autosized},
+ overlapEmbedObjects: #{component.overlapEmbedObjects}
<f:call name="writeVisualOptions" />
});