You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by kn...@apache.org on 2007/03/24 19:09:24 UTC
svn commit: r522075 -
/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
Author: knopp
Date: Sat Mar 24 11:09:23 2007
New Revision: 522075
URL: http://svn.apache.org/viewvc?view=rev&rev=522075
Log:
Modal window fixes
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/modal/ModalWindow.java?view=diff&rev=522075&r1=522074&r2=522075
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/modal/ModalWindow.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/modal/ModalWindow.java Sat Mar 24 11:09:23 2007
@@ -275,20 +275,36 @@
*/
public void show(AjaxRequestTarget target)
{
- target.addComponent(this);
- target.appendJavascript(getWindowOpenJavascript());
- shown = true;
+ if (shown == false) {
+ target.addComponent(this);
+ target.appendJavascript(getWindowOpenJavascript());
+ shown = true;
+ }
}
/**
- * Hides the modal window.
+ * Hides the modal window.
+ * This can be called from within the modal window, however, the
+ * modal window must have configured WindowClosedCallback. Otherwise
+ * use the {@link #close(AjaxRequestTarget)} method.
*
* @param target
* Request target associated with current ajax request.
*/
- public static final void close(AjaxRequestTarget target)
+ public static final void closeCurrent(AjaxRequestTarget target)
{
target.appendJavascript(getCloseJavacript());
+ }
+
+ /**
+ * Closes the modal window.
+ *
+ * @param target
+ * Request target associated with current ajax request.
+ */
+ public void close(AjaxRequestTarget target) {
+ target.appendJavascript(getCloseJavacript());
+ shown = false;
}
/**