You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2009/12/16 22:58:41 UTC

svn commit: r891446 - /wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java

Author: ivaynberg
Date: Wed Dec 16 21:58:41 2009
New Revision: 891446

URL: http://svn.apache.org/viewvc?rev=891446&view=rev
Log:
WICKET-2617 ModalWindow can't be shown when it is rendered with ajax request
Issue: WICKET-2617

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

Modified: wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java?rev=891446&r1=891445&r2=891446&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java (original)
+++ wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java Wed Dec 16 21:58:41 2009
@@ -828,7 +828,14 @@
 	protected boolean makeContentVisible()
 	{
 		// if user is refreshing whole page, the window will not be shown
-		return getWebRequest().isAjax();
+		if (getWebRequest().isAjax() == false)
+		{
+			return false;
+		}
+		else
+		{
+			return shown;
+		}
 	}
 
 	/**