You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by jk...@apache.org on 2006/08/01 04:29:11 UTC
svn commit: r427408 - in /tapestry/tapestry4/trunk:
tapestry-examples/TimeTracker/src/context/Home.html
tapestry-framework/src/java/org/apache/tapestry/link/DirectLinkWorker.java
tapestry-framework/src/js/tapestry/core.js
Author: jkuhnert
Date: Mon Jul 31 19:29:11 2006
New Revision: 427408
URL: http://svn.apache.org/viewvc?rev=427408&view=rev
Log:
Partial fix of TAPESTRY-1037, still need to investigate why Script template body content isn't being captured.
(Still better than the opposite default in tacos, where everything is captured. heh)
Modified:
tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/context/Home.html
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/DirectLinkWorker.java
tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/core.js
Modified: tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/context/Home.html
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/context/Home.html?rev=427408&r1=427407&r2=427408&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/context/Home.html (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/context/Home.html Mon Jul 31 19:29:11 2006
@@ -69,6 +69,7 @@
<div jwcid="projectDescription@Any" >
<span jwcid="@If" condition="ognl:selectedProject">
<h2 style="clear:left" ><span jwcid="@Insert" value="ognl:selectedProject.name" /></h2>
+ <a jwcid="@DirectLink" listener="listener:linkUpdateClicked" async="true">Another link!</a>
</span>
</div>
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/DirectLinkWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/DirectLinkWorker.java?rev=427408&r1=427407&r2=427408&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/DirectLinkWorker.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/DirectLinkWorker.java Mon Jul 31 19:29:11 2006
@@ -89,7 +89,8 @@
parms.put("json", Boolean.valueOf(direct.isJson()));
// execute script template
- _scriptSource.getScript(_script).execute(cycle, prs, parms);
+
+ _scriptSource.getScript(_script).execute(component, cycle, prs, parms);
}
/**
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/core.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/core.js?rev=427408&r1=427407&r2=427408&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/core.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/core.js Mon Jul 31 19:29:11 2006
@@ -92,7 +92,7 @@
if (id == "initializationscript") {
initScripts.push(elms[i]);
continue;
- } else if (id == "bodyScripts") {
+ } else if (id == "bodyscript") {
bodyScripts.push(elms[i]);
continue;
} else if (id == "includescript") {