You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by Jesse Kuhnert <jk...@gmail.com> on 2006/08/23 01:52:18 UTC
Re: svn commit: r433806 - in /tapestry/tapestry4/trunk: tapestry-contrib/src/java/org/apache/tapestry/contrib/ajax/ tapestry-framework/src/java/org/apache/tapestry/services/impl/ tapestry-framework/src/java/org/apache/tapestry/util/ tapestry-framewor
I find it remarkable that so far in 4.1 I haven't really introduced any new
concepts at all.
Even javascript namespaces were already built in :)
On 8/22/06, jkuhnert@apache.org <jk...@apache.org> wrote:
>
> Author: jkuhnert
> Date: Tue Aug 22 16:47:59 2006
> New Revision: 433806
>
> URL: http://svn.apache.org/viewvc?rev=433806&view=rev
> Log:
> Fixed various issues related to namespacing.
>
> Modified:
>
> tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/ajax/Timeout.script
>
> tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/DefaultResponseBuilder.java
>
> tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/util/PageRenderSupportImpl.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-contrib/src/java/org/apache/tapestry/contrib/ajax/Timeout.script
> URL:
> http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/ajax/Timeout.script?rev=433806&r1=433805&r2=433806&view=diff
>
> ==============================================================================
> ---
> tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/ajax/Timeout.script
> (original)
> +++
> tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/ajax/Timeout.script
> Tue Aug 22 16:47:59 2006
> @@ -32,15 +32,14 @@
> <input-symbol key="expirationFunction" />
>
> <body>
> - dojo.event.connect("after", window, "onload", function(){
> - var TimeoutTimerConfirm;
> - var TimeoutProlongSessionTime;
> - var TimeoutExpirationTime;
> + tapestry.TimeoutTimerConfirm=function(){};
> + tapestry.TimeoutProlongSessionTime=function(){};
> + tapestry.TimeoutExpirationTime=function(){};
>
> <if expression="!disableWarning">
> - function TimeoutConfirm()
> + tapestry.TimeoutConfirm=function()
> {
> - TimeoutClearConfirmTimer();
> + tapestry.TimeoutClearConfirmTimer();
>
> var exp = new Date();
> exp.setTime(exp.getTime() + ${expirationTimeout});
> @@ -71,101 +70,85 @@
> </if>
> }
> else {
> - TimeoutProlongSession();
> + tapestry.TimeoutProlongSession();
> }
> }
> </if>
>
> - function TimeoutProlongSession()
> + tapestry.TimeoutProlongSession=function()
> {
> - TimeoutUpdateProlongSessionTime();
> - TimeoutRenewSession();
> + tapestry.TimeoutUpdateProlongSessionTime();
> + tapestry.TimeoutRenewSession();
> }
>
> - function TimeoutSessionRenewed()
> + tapestry.TimeoutSessionRenewed=function()
> {
> - TimeoutClearConfirmTimer();
> - TimeoutInitConfirmTimer();
> + tapestry.TimeoutClearConfirmTimer();
> + tapestry.TimeoutInitConfirmTimer();
> }
>
> - function TimeoutClearConfirmTimer()
> + tapestry.TimeoutClearConfirmTimer=function()
> {
> - window.clearTimeout(TimeoutTimerConfirm);
> + window.clearTimeout(tapestry.TimeoutTimerConfirm);
> }
>
> - function TimeoutInitConfirmTimer()
> + tapestry.TimeoutInitConfirmTimer=function()
> {
> <if expression="!disableWarning">
> - TimeoutTimerConfirm = window.setTimeout("TimeoutConfirm()",
> ${confirmTimeout});
> + tapestry.TimeoutTimerConfirm = window.setTimeout("TimeoutConfirm()",
> ${confirmTimeout});
> </if>
>
> - TimeoutExpirationTime = new Date();
> - TimeoutExpirationTime.setTime(TimeoutExpirationTime.getTime() +
> ${confirmTimeout} + ${expirationTimeout});
> + tapestry.TimeoutExpirationTime = new Date();
> + tapestry.TimeoutExpirationTime.setTime(
> tapestry.TimeoutExpirationTime.getTime() + ${confirmTimeout} +
> ${expirationTimeout});
>
> - TimeoutUpdateProlongSessionTime();
> + tapestry.TimeoutUpdateProlongSessionTime();
> }
>
> - function TimeoutUpdateProlongSessionTime()
> + tapestry.TimeoutUpdateProlongSessionTime=function()
> {
> - TimeoutProlongSessionTime = new Date();
> - TimeoutProlongSessionTime.setTime(
> TimeoutProlongSessionTime.getTime() + ${prolongSessionPeriod});
> + tapestry.TimeoutProlongSessionTime = new Date();
> + tapestry.TimeoutProlongSessionTime.setTime(
> tapestry.TimeoutProlongSessionTime.getTime() + ${prolongSessionPeriod});
> }
>
> <if expression="!disableAutoProlong">
> - var TimeoutPreviousOnClick;
> - var TimeoutPreviousOnMouseMove;
> - var TimeoutPreviousOnKeyPress;
> - var TimeoutPreviousOnScroll;
> -
> - function TimeoutInitChangeObserver()
> +
> + tapestry.TimeoutInitChangeObserver=function()
> {
> - TimeoutPreviousOnClick = document.body.onclick;
> - document.body.onclick = TimeoutHandleOnClick;
> -
> - TimeoutPreviousMouseMove = document.body.onmousemove;
> - document.body.onmousemove = TimeoutHandleOnMouseMove;
> -
> - TimeoutPreviousOnKeyPress = document.body.onkeydown;
> - document.body.onkeydown = TimeoutHandleOnKeyPress;
> -
> - TimeoutPreviousOnScroll = window.onscroll;
> - window.onscroll = TimeoutHandleOnScroll;
> + dojo.event.connect(document.body, "onclick", tapestry,
> "TimeoutHandleOnClick");
> + dojo.event.connect(document.body, "onmousemove", tapestry,
> "TimeoutHandleOnMouseMove");
> + dojo.event.connect(document.body, "onkeydown", tapestry,
> "TimeoutHandleOnKeyPress");
> + dojo.event.connect(window, "onscroll", tapestry,
> "TimeoutHandleOnScroll");
> }
>
> - function TimeoutHandleOnClick() {
> - if (!dj_undef("TimeoutPreviousOnClick", this))
> TimeoutPreviousOnClick();
> - TimeoutRegisterUserAction();
> + tapestry.TimeoutHandleOnClick=function() {
> + tapestry.TimeoutRegisterUserAction();
> }
>
> - function TimeoutHandleOnMouseMove() {
> - if (!dj_undef("TimeoutPreviousOnMouseMove", this))
> TimeoutPreviousOnMouseMove();
> - TimeoutRegisterUserAction();
> + tapestry.TimeoutHandleOnMouseMove=function() {
> + tapestry.TimeoutRegisterUserAction();
> }
>
> - function TimeoutHandleOnKeyPress() {
> - if (!dj_undef("TimeoutPreviousOnKeyPress", this))
> TimeoutPreviousOnKeyPress();
> - TimeoutRegisterUserAction();
> + tapestry.TimeoutHandleOnKeyPress=function() {
> + tapestry.TimeoutRegisterUserAction();
> }
>
> - function TimeoutHandleOnScroll() {
> - if (!dj_undef("TimeoutPreviousOnScroll", this))
> TimeoutPreviousOnScroll();
> - TimeoutRegisterUserAction();
> + tapestry.TimeoutHandleOnScroll=function() {
> + tapestry.TimeoutRegisterUserAction();
> }
>
> - function TimeoutRegisterUserAction()
> + tapestry.TimeoutRegisterUserAction=function()
> {
> var now = new Date();
> - if (now.getTime() > TimeoutProlongSessionTime.getTime()
> &&
> - now.getTime() < TimeoutExpirationTime.getTime())
> - TimeoutProlongSession();
> + if (now.getTime() > tapestry.TimeoutProlongSessionTime.getTime()
> &&
> + now.getTime() < tapestry.TimeoutExpirationTime.getTime
> ())
> + tapestry.TimeoutProlongSession();
> return true;
> }
> </if>
>
> <if expression="!disableAutoProlong">
> - TimeoutInitChangeObserver();
> + tapestry.TimeoutInitChangeObserver();
> </if>
> - TimeoutInitConfirmTimer();
> - });
> + tapestry.TimeoutInitConfirmTimer();
> </body>
> </script>
>
> 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=433806&r1=433805&r2=433806&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
> Tue Aug 22 16:47:59 2006
> @@ -225,12 +225,7 @@
> public void writeBodyScript(IMarkupWriter writer, String script,
> IRequestCycle cycle)
> {
> writer.printRaw("\n\n");
> -
> - writer.printRaw("dojo.event.connect(window, 'onload', function(e)
> {\n");
> -
> writer.printRaw(script);
> -
> - writer.printRaw("});");
> }
>
> /**
> @@ -250,11 +245,17 @@
> */
> public void writeImageInitializations(IMarkupWriter writer, String
> script, String preloadName, IRequestCycle cycle)
> {
> - writer.printRaw("\n\nvar " + preloadName + " = new Array();\n");
> +
> + writer.println();
> + writer.printRaw("dojo.event.connect(window, 'onload', function(e)
> {\n");
> +
> + writer.printRaw("\n\n" + preloadName + " = [];\n");
> writer.printRaw("if (document.images)\n");
> writer.printRaw("{\n");
> writer.printRaw(script);
> writer.printRaw("}\n");
> +
> + writer.printRaw("});");
> }
>
> /**
> @@ -266,7 +267,7 @@
> writer.attribute("type", "text/javascript");
> writer.printRaw("<!--\n");
>
> - writer.printRaw("dojo.event.connect('after', window, 'onload',
> function(e) {\n");
> + writer.printRaw("dojo.event.connect(window, 'onload', function(e)
> {\n");
>
> writer.printRaw(script);
>
>
> Modified:
> tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/util/PageRenderSupportImpl.java
> URL:
> http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/util/PageRenderSupportImpl.java?rev=433806&r1=433805&r2=433806&view=diff
>
> ==============================================================================
> ---
> tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/util/PageRenderSupportImpl.java
> (original)
> +++
> tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/util/PageRenderSupportImpl.java
> Tue Aug 22 16:47:59 2006
> @@ -86,7 +86,7 @@
> _idAllocator = new IdAllocator(namespace);
> _builder = builder;
>
> - _preloadName = (namespace.equals("") ? "tapestry" : namespace) +
> "_preload";
> + _preloadName = (namespace.equals("") ? "tapestry." : namespace) +
> "_preload";
> }
>
> /**
>
> 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=433806&r1=433805&r2=433806&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
> Tue Aug 22 16:47:59 2006
> @@ -144,16 +144,17 @@
>
> builder.writeImageInitializations(mw, imageInit, preload, cycle);
>
> - assertOutput("\n\nvar " + preload + " = new Array();\n"
> + assertOutput("\n"
> + + "dojo.event.connect(window, 'onload', function(e)
> {\n\n\n"
> + + preload + " = [];\n"
> + "if (document.images)\n"
> - + "{\n" + imageInit + "}\n");
> + + "{\n" + imageInit + "}\n"
> + + "});");
>
> builder.writeBodyScript(mw, bscript, cycle);
>
> assertOutput("\n\n"
> - + "dojo.event.connect(window, 'onload', function(e) {\n"
> - + bscript
> - + "});");
> + + bscript);
>
> builder.endBodyScript(mw, cycle);
>
> @@ -210,7 +211,7 @@
> builder.writeInitializationScript(mw, script);
>
> assertOutput("<script type=\"text/javascript\"><!--\n"
> - + "dojo.event.connect('after', window, 'onload',
> function(e) {\n"
> + + "dojo.event.connect(window, 'onload', 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=433806&r1=433805&r2=433806&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
> Tue Aug 22 16:47:59 2006
> @@ -123,23 +123,23 @@
>
> PageRenderSupportImpl prs = new PageRenderSupportImpl(factory,
> "", l, newBuilder(writer));
>
> - assertEquals("tapestry_preload[0].src",
> prs.getPreloadedImageReference("/foo/bar.gif"));
> - assertEquals("tapestry_preload[1].src",
> prs.getPreloadedImageReference("/zip/zap.png"));
> - assertEquals("tapestry_preload[0].src",
> prs.getPreloadedImageReference("/foo/bar.gif"));
> + assertEquals("tapestry._preload[0].src",
> prs.getPreloadedImageReference("/foo/bar.gif"));
> + assertEquals("tapestry._preload[1].src",
> prs.getPreloadedImageReference("/zip/zap.png"));
> + assertEquals("tapestry._preload[0].src",
> prs.getPreloadedImageReference("/foo/bar.gif"));
>
> prs.addBodyScript("myBodyScript();");
>
> prs.writeBodyScript(writer, cycle);
>
> assertOutput(new String[]
> - { "<script type=\"text/javascript\"><!--", "",
> - "var tapestry_preload = new Array();", "if (
> document.images)", "{",
> - " tapestry_preload[0] = new Image();",
> - " tapestry_preload[0].src = \"/foo/bar.gif\";",
> - " tapestry_preload[1] = new Image();",
> - " tapestry_preload[1].src = \"/zip/zap.png\";", "}", "",
> "",
> - "dojo.event.connect(window, 'onload', function(e) {",
> - "myBodyScript();});",
> + { "<script type=\"text/javascript\"><!--",
> + "dojo.event.connect(window, 'onload', function(e) {",
> "","",
> + "tapestry._preload = [];", "if (document.images)", "{",
> + " tapestry._preload[0] = new Image();",
> + " tapestry._preload[0].src = \"/foo/bar.gif\";",
> + " tapestry._preload[1] = new Image();",
> + " tapestry._preload[1].src = \"/zip/zap.png\";", "}",
> "});", "",
> + "myBodyScript();",
> "", "// --></script>" });
>
> verify();
> @@ -161,10 +161,13 @@
> prs.writeBodyScript(writer, cycle);
>
> assertOutput(new String[]
> - { "<script type=\"text/javascript\"><!--", "",
> - "var NAMESPACE_preload = new Array();", "if (
> document.images)", "{",
> + {"<script type=\"text/javascript\"><!--",
> + "dojo.event.connect(window, 'onload', function(e)
> {","","",
> + "NAMESPACE_preload = [];", "if (document.images)", "{",
> " NAMESPACE_preload[0] = new Image();",
> - " NAMESPACE_preload[0].src = \"/foo/bar.gif\";", "}",
> "", "", "// --></script>" });
> + " NAMESPACE_preload[0].src = \"/foo/bar.gif\";", "}",
> + "});","",
> + "// --></script>" });
>
> verify();
> }
> @@ -186,8 +189,7 @@
>
> assertOutput(new String[]
> { "<script type=\"text/javascript\"><!--","",
> - "dojo.event.connect(window, 'onload', function(e) {",
> - "myBodyScript();});",
> + "myBodyScript();",
> "", "// --></script>" });
>
> verify();
> @@ -244,7 +246,7 @@
>
> assertOutput(new String[]
> { "<script type=\"text/javascript\"><!--",
> - "dojo.event.connect('after', window, 'onload',
> function(e) {",
> + "dojo.event.connect(window, 'onload', function(e) {",
> "myInitializationScript1();",
> "myInitializationScript2();",
> "});", "// --></script>" });
>
>
>
>
--
Jesse Kuhnert
Tapestry/Dojo/(and a dash of TestNG), team member/developer
Open source based consulting work centered around
dojo/tapestry/tacos/hivemind.