Author: mgrigorov
Date: Mon May 2 13:39:38 2011
New Revision: 1098561
URL: http://svn.apache.org/viewvc?rev=1098561&view=rev
Log:
WICKET-3059 IAjaxCallDecorator should implement IHeaderContributor
Call IAjaxCallDecorator's #renderHead() *after* the contribution of the
behavior itself.
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java?rev=1098561&r1=1098560&r2=1098561&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
Mon May 2 13:39:38 2011
@@ -73,19 +73,10 @@ public abstract class AbstractDefaultAja
{
super.renderHead(component, response);
- IAjaxCallDecorator ajaxCallDecorator = getAjaxCallDecorator();
-
- if (ajaxCallDecorator instanceof IHeaderContributor)
- {
- IHeaderContributor contributor =
(IHeaderContributor)ajaxCallDecorator;
- contributor.renderHead(component, response);
- }
-
- final IDebugSettings debugSettings =
Application.get().getDebugSettings();
-
response.renderJavaScriptReference(WicketEventReference.INSTANCE);
response.renderJavaScriptReference(WicketAjaxReference.INSTANCE);
+ final IDebugSettings debugSettings =
Application.get().getDebugSettings();
if (debugSettings.isAjaxDebugModeEnabled())
{
response.renderJavaScriptReference(JAVASCRIPT_DEBUG);
@@ -96,6 +87,13 @@ public abstract class AbstractDefaultAja
CharSequence ajaxBaseUrl =
Strings.escapeMarkup(baseUrl.toString());
response.renderJavaScript("Wicket.Ajax.baseUrl=\"" +
ajaxBaseUrl + "\";",
"wicket-ajax-base-url");
+
+ final IAjaxCallDecorator ajaxCallDecorator =
getAjaxCallDecorator();
+ if (ajaxCallDecorator instanceof IHeaderContributor)
+ {
+ IHeaderContributor contributor =
(IHeaderContributor)ajaxCallDecorator;
+ contributor.renderHead(component, response);
+ }
}
/**
