You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jd...@apache.org on 2009/10/24 13:58:18 UTC
svn commit: r829351 -
/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
Author: jdonnerstag
Date: Sat Oct 24 11:58:18 2009
New Revision: 829351
URL: http://svn.apache.org/viewvc?rev=829351&view=rev
Log:
show make it more easier: open Modal Window without AjaxRequestTarget
Issue: WICKET-12
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=829351&r1=829350&r2=829351&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 Sat Oct 24 11:58:18 2009
@@ -811,11 +811,7 @@
@Override
protected void onBeforeRender()
{
- // if user is refreshing whole page, the window will not be shown
- if (getWebRequest().isAjax() == false)
- {
- shown = false;
- }
+ shown = makeContentVisible();
getContent().setOutputMarkupId(true);
getContent().setVisible(shown);
@@ -824,6 +820,18 @@
}
/**
+ * You may subclass this method in case you don't want to show up the window on normal page
+ * refresh.
+ *
+ * @return true, if the window shall be shown
+ */
+ protected boolean makeContentVisible()
+ {
+ // if user is refreshing whole page, the window will not be shown
+ return getWebRequest().isAjax();
+ }
+
+ /**
* @see org.apache.wicket.markup.html.panel.Panel#onComponentTag(org.apache.wicket.markup.ComponentTag)
*/
@Override