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/07 22:05:37 UTC
svn commit: r515758 -
/incubator/wicket/branches/wicket-1.x/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
Author: knopp
Date: Wed Mar 7 13:05:36 2007
New Revision: 515758
URL: http://svn.apache.org/viewvc?view=rev&rev=515758
Log:
Fixed not to fire onclosed ajax request if noone is interested
Modified:
incubator/wicket/branches/wicket-1.x/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
Modified: incubator/wicket/branches/wicket-1.x/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/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/modal/ModalWindow.java?view=diff&rev=515758&r1=515757&r2=515758
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/modal/ModalWindow.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket-extensions/src/main/java/wicket/extensions/ajax/markup/html/modal/ModalWindow.java Wed Mar 7 13:05:36 2007
@@ -762,6 +762,7 @@
throw new WicketRuntimeException("Modal window content id is wrong.");
}
replace(component);
+ shown = false;
}
/**
@@ -936,9 +937,12 @@
+ "};\n");
}
- WindowClosedBehavior behavior = (WindowClosedBehavior)getBehaviors(
- WindowClosedBehavior.class).get(0);
- buffer.append("settings.onClose = function() { " + behavior.getCallbackScript() + " };\n");
+ if (isCustomComponent() == false || windowClosedCallback != null)
+ {
+ WindowClosedBehavior behavior = (WindowClosedBehavior)getBehaviors(
+ WindowClosedBehavior.class).get(0);
+ buffer.append("settings.onClose = function() { " + behavior.getCallbackScript() + " };\n");
+ }
buffer.append("Wicket.Window.create(settings).show();\n");