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:05 UTC
svn commit: r522074 - in
/incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-examples/src/main/java/wicket/examples/ajax/builtin/modal:
ModalContent1Page.java ModalContent2Page.java ModalWindowPage.java
Author: knopp
Date: Sat Mar 24 11:09:04 2007
New Revision: 522074
URL: http://svn.apache.org/viewvc?view=rev&rev=522074
Log:
Modal window fixes
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-examples/src/main/java/wicket/examples/ajax/builtin/modal/ModalContent1Page.java
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-examples/src/main/java/wicket/examples/ajax/builtin/modal/ModalContent2Page.java
incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-examples/src/main/java/wicket/examples/ajax/builtin/modal/ModalWindowPage.java
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-examples/src/main/java/wicket/examples/ajax/builtin/modal/ModalContent1Page.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-examples/src/main/java/wicket/examples/ajax/builtin/modal/ModalContent1Page.java?view=diff&rev=522074&r1=522073&r2=522074
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-examples/src/main/java/wicket/examples/ajax/builtin/modal/ModalContent1Page.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-examples/src/main/java/wicket/examples/ajax/builtin/modal/ModalContent1Page.java Sat Mar 24 11:09:04 2007
@@ -30,23 +30,17 @@
/**
*
- */
- public ModalContent1Page() {
- this(null);
- }
-
- /**
- *
* @param modalWindowPage
+ * @param window
*/
- public ModalContent1Page(final ModalWindowPage modalWindowPage)
+ public ModalContent1Page(final ModalWindowPage modalWindowPage, final ModalWindow window)
{
add(new AjaxLink("closeOK")
{
public void onClick(AjaxRequestTarget target) {
if (modalWindowPage != null)
modalWindowPage.setResult("Modal window 1 - close link OK");
- ModalWindow.close(target);
+ window.close(target);
}
});
@@ -56,7 +50,7 @@
{
if (modalWindowPage != null)
modalWindowPage.setResult("Modal window 1 - close link Cancel");
- ModalWindow.close(target);
+ window.close(target);
}
});
@@ -76,7 +70,7 @@
modal.setPageCreator(new ModalWindow.PageCreator() {
public Page createPage() {
- return new ModalContent2Page();
+ return new ModalContent2Page(modal);
}
});
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-examples/src/main/java/wicket/examples/ajax/builtin/modal/ModalContent2Page.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-examples/src/main/java/wicket/examples/ajax/builtin/modal/ModalContent2Page.java?view=diff&rev=522074&r1=522073&r2=522074
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-examples/src/main/java/wicket/examples/ajax/builtin/modal/ModalContent2Page.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-examples/src/main/java/wicket/examples/ajax/builtin/modal/ModalContent2Page.java Sat Mar 24 11:09:04 2007
@@ -28,14 +28,14 @@
public class ModalContent2Page extends WebPage {
/**
- *
+ * @param window
*/
- public ModalContent2Page()
+ public ModalContent2Page(final ModalWindow window)
{
add(new AjaxLink("close")
{
public void onClick(AjaxRequestTarget target) {
- ModalWindow.close(target);
+ window.close(target);
}
});
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-examples/src/main/java/wicket/examples/ajax/builtin/modal/ModalWindowPage.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-examples/src/main/java/wicket/examples/ajax/builtin/modal/ModalWindowPage.java?view=diff&rev=522074&r1=522073&r2=522074
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-examples/src/main/java/wicket/examples/ajax/builtin/modal/ModalWindowPage.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-examples/src/main/java/wicket/examples/ajax/builtin/modal/ModalWindowPage.java Sat Mar 24 11:09:04 2007
@@ -52,7 +52,7 @@
{
public Page createPage()
{
- return new ModalContent1Page(ModalWindowPage.this);
+ return new ModalContent1Page(ModalWindowPage.this, modal1);
}
});
modal1.setWindowClosedCallback(new ModalWindow.WindowClosedCallback()
@@ -75,6 +75,15 @@
{
public void onClick(AjaxRequestTarget target)
{
+ try
+ {
+ Thread.sleep(500);
+ }
+ catch (InterruptedException e)
+ {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
modal1.show(target);
}
});