You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2014/05/26 12:33:10 UTC
[09/12] git commit: ISIS-793: make easier to override filtering of
Javascript contributions
ISIS-793: make easier to override filtering of Javascript contributions
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/c31e50ff
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/c31e50ff
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/c31e50ff
Branch: refs/heads/master
Commit: c31e50ffb1e8c3bec548c11784bf7996b2cdb418
Parents: 813841a
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon May 26 11:12:56 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon May 26 11:12:56 2014 +0100
----------------------------------------------------------------------
.../wicket/viewer/IsisWicketApplication.java | 36 ++++++++++++++------
1 file changed, 25 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/c31e50ff/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
index ae8c427..9d80a4c 100644
--- a/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
+++ b/component/viewer/wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/IsisWicketApplication.java
@@ -239,17 +239,8 @@ public class IsisWicketApplication extends AuthenticatedWebApplication implement
// must be done after injected componentFactoryRegistry into the app itself
buildCssBundle();
- // filters Javascript header contributions so rendered to bottom of page
- setHeaderResponseDecorator(new IHeaderResponseDecorator()
- {
- @Override
- public IHeaderResponse decorate(IHeaderResponse response)
- {
- // use this header resource decorator to load all JavaScript resources in the page
- // footer (after </body>)
- return new JavaScriptFilteredIntoFooterHeaderResponse(response, "footerJS");
- }
- });
+ filterJavascriptContributions();
+
//
// map entity and action to provide prettier URLs
@@ -492,6 +483,29 @@ public class IsisWicketApplication extends AuthenticatedWebApplication implement
// //////////////////////////////////////
/**
+ * filters Javascript header contributions so rendered to bottom of page.
+ *
+ * <p>
+ * Factored out for easy (informal) pluggability.
+ * </p>
+ */
+ protected void filterJavascriptContributions() {
+ setHeaderResponseDecorator(new IHeaderResponseDecorator()
+ {
+ @Override
+ public IHeaderResponse decorate(IHeaderResponse response)
+ {
+ // use this header resource decorator to load all JavaScript resources in the page
+ // footer (after </body>)
+ return new JavaScriptFilteredIntoFooterHeaderResponse(response, "footerJS");
+ }
+ });
+ }
+
+
+ // //////////////////////////////////////
+
+ /**
* The validation errors, if any, that occurred on {@link #init() startup}.
*/
public List<String> getValidationErrors() {