Author: dashorst
Date: Thu Nov 30 07:44:10 2006
New Revision: 480974
URL: http://svn.apache.org/viewvc?view=rev&rev=480974
Log:
WICKET-112 Fix for missing detach calls after Ajax request.
Modified:
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/Component.java
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/Page.java
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/ajax/AjaxRequestTarget.java
Modified:
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/Component.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/Component.java?view=diff&rev=480974&r1=480973&r2=480974
==============================================================================
---
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/Component.java
(original)
+++
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/Component.java
Thu Nov 30 07:44:10 2006
@@ -1653,9 +1653,6 @@
// Component has been rendered
notifyBehaviorsComponentRendered();
-
- // detach
- internalDetach();
}
}
Modified:
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/Page.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/Page.java?view=diff&rev=480974&r1=480973&r2=480974
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/Page.java
(original)
+++ incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/Page.java
Thu Nov 30 07:44:10 2006
@@ -284,11 +284,8 @@
*/
public void internalDetach()
{
- if (attached)
- {
- super.internalDetach();
- attached = false;
- }
+ super.internalDetach();
+ attached = false;
}
/**
Modified:
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/ajax/AjaxRequestTarget.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/ajax/AjaxRequestTarget.java?view=diff&rev=480974&r1=480973&r2=480974
==============================================================================
---
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/ajax/AjaxRequestTarget.java
(original)
+++
incubator/wicket/branches/wicket-1.x/wicket/src/main/java/wicket/ajax/AjaxRequestTarget.java
Thu Nov 30 07:44:10 2006
@@ -261,6 +261,11 @@
*/
public void detach(final RequestCycle requestCycle)
{
+// Page page = requestCycle.getRequest().getPage();
+// if(page != null)
+// {
+// page.detachModels();
+// }
}
/**
@@ -525,7 +530,7 @@
encodingHeaderResponse.reset();
component.renderHead(header);
- component.detachBehaviors();
+
if (component instanceof MarkupContainer)
{
((MarkupContainer)component).visitChildren(new
Component.IVisitor()
@@ -535,7 +540,6 @@
if (component.isVisible())
{
component.renderHead(header);
- component.detachBehaviors();
return CONTINUE_TRAVERSAL;
}
else
