You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by dr...@apache.org on 2010/01/11 21:18:04 UTC

svn commit: r898051 - in /tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5: SymbolConstants.java internal/services/ClientInfrastructureImpl.java services/TapestryModule.java

Author: drobiazko
Date: Mon Jan 11 20:18:03 2010
New Revision: 898051

URL: http://svn.apache.org/viewvc?rev=898051&view=rev
Log:
TAP5-884: Introduce a symbol for tapestry.js

Modified:
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/SymbolConstants.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClientInfrastructureImpl.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/SymbolConstants.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/SymbolConstants.java?rev=898051&r1=898050&r2=898051&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/SymbolConstants.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/SymbolConstants.java Mon Jan 11 20:18:03 2010
@@ -283,5 +283,12 @@
      * without explicit user contributions.
      */
     public static final String CONTEXT_ASSETS_AVAILABLE ="tapestry.context-assets-available";
+    
+    /**
+     * The default javascript (tapestry.js) automatically injected into every rendered HTML page. 
+     *
+     * @since 5.2.0.0
+     */
+    public static final String DEFAULT_JAVASCRIPT = "tapestry.default-javascript";
 
 }

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClientInfrastructureImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClientInfrastructureImpl.java?rev=898051&r1=898050&r2=898051&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClientInfrastructureImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/ClientInfrastructureImpl.java Mon Jan 11 20:18:03 2010
@@ -56,7 +56,7 @@
 
                     // Uses functions defined by the prior three
 
-                    "org/apache/tapestry5/tapestry.js",
+                    "${tapestry.default-javascript}",
             };
 
     private static final String[] CORE_STYLESHEET = new String[]

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java?rev=898051&r1=898050&r2=898051&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/TapestryModule.java Mon Jan 11 20:18:03 2010
@@ -2317,6 +2317,9 @@
 
         configuration.add(SymbolConstants.START_PAGE_NAME, "start");
 
+        configuration.add(SymbolConstants.DEFAULT_JAVASCRIPT,
+        		"classpath:/org/apache/tapestry5/tapestry.js");
+        
         configuration.add(SymbolConstants.DEFAULT_STYLESHEET,
                 "classpath:/org/apache/tapestry5/default.css");
         configuration.add("tapestry.spacer-image", "classpath:/org/apache/tapestry5/spacer.gif");