You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@wicket.apache.org by mg...@apache.org on 2010/10/06 20:55:13 UTC

svn commit: r1005202 - /wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java

Author: mgrigorov
Date: Wed Oct  6 18:55:12 2010
New Revision: 1005202

URL: http://svn.apache.org/viewvc?rev=1005202&view=rev
Log:
WICKET-3087 Form inside ModalWindow causes 'Submit Button not visible' exception in parent page's form

Update the DOM for the modal window content when closing it - remove the content.

merge r1005201 from 1.4.x


Modified:
    wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java

Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java?rev=1005202&r1=1005201&r2=1005202&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java Wed Oct  6 18:55:12 2010
@@ -352,6 +352,10 @@ public class ModalWindow extends Panel
 	public void close(final AjaxRequestTarget target)
 	{
 		getContent().setVisible(false);
+		if (isCustomComponent())
+		{
+			target.addComponent(getContent());
+		}
 		target.appendJavascript(getCloseJavacript());
 		shown = false;
 	}