Author: andyhot
Date: Fri Sep 28 03:33:53 2007
New Revision: 580292
URL: http://svn.apache.org/viewvc?rev=580292&view=rev
Log:
TAPESTRY-1772: Add on load to go
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/AjaxShellDelegate.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/DefaultResponseBuilder.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/DefaultResponseBuilderTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/util/TestPageRenderSupport.java
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/AjaxShellDelegate.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/AjaxShellDelegate.java?rev=580292&r1=580291&r2=580292&view=diff
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/AjaxShellDelegate.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/AjaxShellDelegate.java
Fri Sep 28 03:33:53 2007
@@ -15,7 +15,6 @@
import org.apache.hivemind.util.Defense;
import org.apache.tapestry.*;
-import org.apache.tapestry.html.Shell;
import org.apache.tapestry.json.JSONLiteral;
import org.apache.tapestry.json.JSONObject;
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/DefaultResponseBuilder.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/DefaultResponseBuilder.java?rev=580292&r1=580291&r2=580292&view=diff
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/DefaultResponseBuilder.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/DefaultResponseBuilder.java
Fri Sep 28 03:33:53 2007
@@ -405,7 +405,7 @@
{
writer.println();
- writer.printRaw("dojo.addOnLoad(function(e) {\n");
+ writer.printRaw("tapestry.addOnLoad(function(e) {\n");
writer.printRaw(preloadName + " = [];\n");
writer.printRaw("if (document.images)\n");
@@ -425,7 +425,7 @@
writer.attribute("type", "text/javascript");
writer.printRaw("<!--\n");
- writer.printRaw("dojo.addOnLoad(function(e) {\n");
+ writer.printRaw("tapestry.addOnLoad(function(e) {\n");
writer.printRaw(script);
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/DefaultResponseBuilderTest.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/DefaultResponseBuilderTest.java?rev=580292&r1=580291&r2=580292&view=diff
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/DefaultResponseBuilderTest.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/DefaultResponseBuilderTest.java
Fri Sep 28 03:33:53 2007
@@ -145,7 +145,7 @@
builder.writeImageInitializations(mw, imageInit, preload, cycle);
assertOutput(LINE_SEPARATOR
- + "dojo.addOnLoad(function(e) {\n"
+ + "tapestry.addOnLoad(function(e) {\n"
+ preload + " = [];\n"
+ "if (document.images)\n"
+ "{\n" + imageInit + "}\n"
@@ -210,7 +210,7 @@
builder.writeInitializationScript(mw, script);
assertOutput("<script type=\"text/javascript\"><!--\n"
- + "dojo.addOnLoad(function(e) {\n"
+ + "tapestry.addOnLoad(function(e) {\n"
+ script
+ "});"
+ "\n// -->"
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/util/TestPageRenderSupport.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/util/TestPageRenderSupport.java?rev=580292&r1=580291&r2=580292&view=diff
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/util/TestPageRenderSupport.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/util/TestPageRenderSupport.java
Fri Sep 28 03:33:53 2007
@@ -146,7 +146,7 @@
assertOutput(new String[]
{ "<script type=\"text/javascript\"><!--","",
- "dojo.addOnLoad(function(e) {",
+ "tapestry.addOnLoad(function(e) {",
"tapestry.preload = [];", "if (document.images)", "{",
"tapestry.preload[0] = new Image();",
" tapestry.preload[0].src = \"/foo/bar.gif\";",
@@ -174,7 +174,7 @@
assertOutput(new String[]
{"<script type=\"text/javascript\"><!--", "",
- "dojo.addOnLoad(function(e) {",
+ "tapestry.addOnLoad(function(e) {",
"NAMESPACE.preload = [];", "if (document.images)", "{",
"NAMESPACE.preload[0] = new Image();",
" NAMESPACE.preload[0].src = \"/foo/bar.gif\";}",
@@ -264,7 +264,7 @@
assertOutput(new String[]
{ "<script type=\"text/javascript\"><!--",
- "dojo.addOnLoad(function(e) {",
+ "tapestry.addOnLoad(function(e) {",
"myInitializationScript1();", "myInitializationScript2();",
"dojo.require(\"dojo.event.*\");","dojo.require(\"dojo.widget.*\");",
"",
