Author: pyaschenko
Date: 2007-08-22 12:15:25 -0400 (Wed, 22 Aug 2007)
New Revision: 2406
Modified:
trunk/ui/modal-panel/src/main/config/component/modalPanel.xml
trunk/ui/modal-panel/src/main/java/org/richfaces/renderkit/ModalPanelRendererBase.java
Log:
RF-663 fixed
Modified: trunk/ui/modal-panel/src/main/config/component/modalPanel.xml
===================================================================
--- trunk/ui/modal-panel/src/main/config/component/modalPanel.xml 2007-08-22 14:51:53 UTC
(rev 2405)
+++ trunk/ui/modal-panel/src/main/config/component/modalPanel.xml 2007-08-22 16:15:25 UTC
(rev 2406)
@@ -143,14 +143,6 @@
</property>
<property>
- <name>showWhenRendered</name>
- <classname>boolean</classname>
- <description>
- If 'true' modalPanel should be rendered after first page loading
- </description>
- </property>
-
- <property>
<name>keepVisualState</name>
<classname>boolean</classname>
<description>
@@ -187,7 +179,7 @@
<name>showWhenRendered</name>
<classname>boolean</classname>
<description>
- iA "true" value for this attribute makes a modal panel opened as default.
+ If "true" value for this attribute makes a modal panel opened as default.
</description>
<defaultvalue>false</defaultvalue>
</property>
Modified:
trunk/ui/modal-panel/src/main/java/org/richfaces/renderkit/ModalPanelRendererBase.java
===================================================================
---
trunk/ui/modal-panel/src/main/java/org/richfaces/renderkit/ModalPanelRendererBase.java 2007-08-22
14:51:53 UTC (rev 2405)
+++
trunk/ui/modal-panel/src/main/java/org/richfaces/renderkit/ModalPanelRendererBase.java 2007-08-22
16:15:25 UTC (rev 2406)
@@ -134,7 +134,7 @@
public String getShowScript(FacesContext context, UIModalPanel panel) {
StringBuffer result = new StringBuffer();
- if (panel.isKeepVisualState() && panel.isShowWhenRendered()) {
+ if (panel.isKeepVisualState() || panel.isShowWhenRendered()) {
result.append("Richfaces.showModalPanel('" + panel.getClientId(context)
+ "', {");
Iterator it = panel.getVisualOptions().entrySet().iterator();
Show replies by date