You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2010/12/01 16:09:20 UTC
svn commit: r1041043 - in /wicket/trunk/wicket/src:
main/java/org/apache/wicket/ajax/AjaxRequestTarget.java
test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_ajax_expected.html
Author: mgrigorov
Date: Wed Dec 1 15:09:20 2010
New Revision: 1041043
URL: http://svn.apache.org/viewvc?rev=1041043&view=rev
Log:
merge r1040980 from 1.4.x
fix form previous commit: 1031432
AjaxRequestTarget was not calling IHeaderResponse.close() after traversing hierarchy to renderhead on all appropriate iheadercontributors
and revert the expected html response from r1033843
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java
wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_ajax_expected.html
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java?rev=1041043&r1=1041042&r2=1041043&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AjaxRequestTarget.java Wed Dec 1 15:09:20 2010
@@ -710,6 +710,11 @@ public class AjaxRequestTarget implement
respondComponent(response, getAjaxRegionMarkupId(component), component);
}
}
+
+ if (header != null)
+ {
+ header.getHeaderResponse().close();
+ }
}
private String getAjaxRegionMarkupId(Component component)
@@ -817,7 +822,8 @@ public class AjaxRequestTarget implement
* @param component
* component to render
*/
- private void respondComponent(final Response response, final String markupId, final Component component)
+ private void respondComponent(final Response response, final String markupId,
+ final Component component)
{
if (component.getRenderBodyOnly() == true)
{
@@ -1162,7 +1168,6 @@ public class AjaxRequestTarget implement
}
});
}
- header.getHeaderResponse().close();
// revert to old response
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_ajax_expected.html
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_ajax_expected.html?rev=1041043&r1=1041042&r2=1041043&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_ajax_expected.html (original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_ajax_expected.html Wed Dec 1 15:09:20 2010
@@ -9,6 +9,7 @@ test
test
</span>]]></component><header-contribution><![CDATA[<head xmlns:wicket="http://wicket.apache.org">
<link href="../test2"/>
+<script type="text/javascript" src="../javascripturlB"></script>
</head>]]></header-contribution><component id="btest14" ><![CDATA[<span id="btest14">
test
</span>]]></component><component id="btest25" ><![CDATA[<span id="btest25">