Load Prototype as a shim module, and not as part of the core JavaScript stack
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/febfe01a Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/febfe01a Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/febfe01a Branch: refs/heads/5.4-js-rewrite Commit: febfe01a66d601e7028af6032837c516a10875f9 Parents: c29e9b0 Author: Howard M. Lewis Ship <[email protected]> Authored: Fri Aug 10 11:21:59 2012 -0700 Committer: Howard M. Lewis Ship <[email protected]> Committed: Fri Aug 10 11:21:59 2012 -0700 ---------------------------------------------------------------------- .../services/javascript/CoreJavaScriptStack.java | 4 ---- .../services/javascript/JavaScriptModule.java | 7 +++++-- 2 files changed, 5 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/febfe01a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/CoreJavaScriptStack.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/CoreJavaScriptStack.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/CoreJavaScriptStack.java index a1cb371..0e85a2a 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/CoreJavaScriptStack.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/CoreJavaScriptStack.java @@ -54,10 +54,6 @@ public class CoreJavaScriptStack implements JavaScriptStack { // Core scripts added to any page that uses scripting - // TODO: Only include prototype based on configuration - "${tapestry.scriptaculous}/prototype.js", - - // TODO: Only include these two when in compatibility mode ... // after the t5-* and tapestry libraries have been stripped // of Scriptaculous code. http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/febfe01a/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JavaScriptModule.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JavaScriptModule.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JavaScriptModule.java index d8a0d79..ac84869 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JavaScriptModule.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/JavaScriptModule.java @@ -14,7 +14,6 @@ package org.apache.tapestry5.services.javascript; -import org.apache.tapestry5.Asset; import org.apache.tapestry5.MarkupWriter; import org.apache.tapestry5.RenderSupport; import org.apache.tapestry5.annotations.Path; @@ -233,9 +232,13 @@ public class JavaScriptModule @Contribute(ModuleManager.class) public static void setupBaseModuleShims(MappedConfiguration<String, Object> configuration, @Inject @Path("classpath:org/apache/tapestry5/underscore_1_3_3.js") - Resource underscore) + Resource underscore, + + @Inject @Path("${tapestry.scriptaculous}/prototype.js") + Resource prototype) { configuration.add("_", new ShimModule(underscore, null, "_")); + configuration.add("prototype", new ShimModule(prototype, null, null)); } }
