Repository: wicket Updated Branches: refs/heads/master 0e44f3df8 -> 495a3e2ee
WICKET-5585 Wicket Extension Automplete does not work well with JavaScriptFilteredIntoFooterHeaderResponse (cherry picked from commit 1d057ace543e40ea4d6b2fd451f4eeb580cc902b) Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/495a3e2e Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/495a3e2e Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/495a3e2e Branch: refs/heads/master Commit: 495a3e2ee21794cc199537a4e5745291e73bdd7e Parents: 0e44f3d Author: Martin Tzvetanov Grigorov <mgrigo...@apache.org> Authored: Thu May 8 13:03:20 2014 +0300 Committer: Martin Tzvetanov Grigorov <mgrigo...@apache.org> Committed: Thu May 8 13:04:01 2014 +0300 ---------------------------------------------------------------------- .../filter/JavaScriptAcceptingHeaderResponseFilter.java | 9 ++++++++- .../filter/JavaScriptFilteredIntoFooterHeaderResponse.java | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/495a3e2e/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/JavaScriptAcceptingHeaderResponseFilter.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/JavaScriptAcceptingHeaderResponseFilter.java b/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/JavaScriptAcceptingHeaderResponseFilter.java index b77ce9b..26cd633 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/JavaScriptAcceptingHeaderResponseFilter.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/JavaScriptAcceptingHeaderResponseFilter.java @@ -18,6 +18,9 @@ package org.apache.wicket.markup.head.filter; import org.apache.wicket.markup.head.HeaderItem; import org.apache.wicket.markup.head.JavaScriptHeaderItem; +import org.apache.wicket.markup.head.OnDomReadyHeaderItem; +import org.apache.wicket.markup.head.OnEventHeaderItem; +import org.apache.wicket.markup.head.OnLoadHeaderItem; /** * This filter accepts all {@link JavaScriptHeaderItem}s. @@ -45,6 +48,10 @@ public class JavaScriptAcceptingHeaderResponseFilter extends AbstractHeaderRespo @Override protected boolean acceptsWrapped(HeaderItem item) { - return item instanceof JavaScriptHeaderItem; + return (item instanceof JavaScriptHeaderItem || + item instanceof OnDomReadyHeaderItem || + item instanceof OnLoadHeaderItem || + item instanceof OnEventHeaderItem + ); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/495a3e2e/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/JavaScriptFilteredIntoFooterHeaderResponse.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/JavaScriptFilteredIntoFooterHeaderResponse.java b/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/JavaScriptFilteredIntoFooterHeaderResponse.java index ec7e6b2..5f1314b 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/JavaScriptFilteredIntoFooterHeaderResponse.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/head/filter/JavaScriptFilteredIntoFooterHeaderResponse.java @@ -59,12 +59,12 @@ public final class JavaScriptFilteredIntoFooterHeaderResponse extends FilteringH return Arrays.asList(header, footer); } - private IHeaderResponseFilter createFooterFilter(String footerBucketName) + protected IHeaderResponseFilter createFooterFilter(String footerBucketName) { return new JavaScriptAcceptingHeaderResponseFilter(footerBucketName); } - private IHeaderResponseFilter createHeaderFilter(String headerFilterName, IHeaderResponseFilter footerFilter) + protected IHeaderResponseFilter createHeaderFilter(String headerFilterName, IHeaderResponseFilter footerFilter) { return new OppositeHeaderResponseFilter(headerFilterName, footerFilter); }
