Author: jkuhnert
Date: Fri Mar 17 06:57:32 2006
New Revision: 386648
URL: http://svn.apache.org/viewcvs?rev=386648&view=rev
Log:
Applied patches
Modified:
jakarta/tapestry/branches/branch-3-0/contrib/src/org/apache/tapestry/contrib/link/PopupLinkRenderer.java
jakarta/tapestry/branches/branch-3-0/contrib/src/org/apache/tapestry/contrib/table/components/TableFormPages.html
jakarta/tapestry/branches/branch-3-0/contrib/src/org/apache/tapestry/contrib/table/components/TableFormPages.jwc
jakarta/tapestry/branches/branch-3-0/status.xml
Modified:
jakarta/tapestry/branches/branch-3-0/contrib/src/org/apache/tapestry/contrib/link/PopupLinkRenderer.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/branches/branch-3-0/contrib/src/org/apache/tapestry/contrib/link/PopupLinkRenderer.java?rev=386648&r1=386647&r2=386648&view=diff
==============================================================================
---
jakarta/tapestry/branches/branch-3-0/contrib/src/org/apache/tapestry/contrib/link/PopupLinkRenderer.java
(original)
+++
jakarta/tapestry/branches/branch-3-0/contrib/src/org/apache/tapestry/contrib/link/PopupLinkRenderer.java
Fri Mar 17 06:57:32 2006
@@ -53,6 +53,10 @@
*/
protected String constructURL(ILink link, String anchor, IRequestCycle
cycle)
{
+ if (cycle.isRewinding()) {
+ return null;
+ }
+
String url = link.getURL(anchor, true);
return "javascript: w = window.open(" + normalizeString(url) +
", " + normalizeString(getWindowName()) + ", " + normalizeString(getFeatures())
+ "); w.focus();";
}
Modified:
jakarta/tapestry/branches/branch-3-0/contrib/src/org/apache/tapestry/contrib/table/components/TableFormPages.html
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/branches/branch-3-0/contrib/src/org/apache/tapestry/contrib/table/components/TableFormPages.html?rev=386648&r1=386647&r2=386648&view=diff
==============================================================================
---
jakarta/tapestry/branches/branch-3-0/contrib/src/org/apache/tapestry/contrib/table/components/TableFormPages.html
(original)
+++
jakarta/tapestry/branches/branch-3-0/contrib/src/org/apache/tapestry/contrib/table/components/TableFormPages.html
Fri Mar 17 06:57:32 2006
@@ -2,27 +2,31 @@
<span jwcid="$content$">
-<span jwcid="hiddenCurrentPage"/>
-<span jwcid="hiddenPageCount"/>
-<span jwcid="hiddenStartPage"/>
-<span jwcid="hiddenStopPage"/>
-
-<a jwcid="linkFirst"><<</a>
-<a jwcid="linkBack"><</a>
-
-<span jwcid="iterPage">
-
- <span jwcid="condCurrent">
- <b><span jwcid="insertCurrentPage"/></b>
- </span>
-
- <span jwcid="condOther">
- <a jwcid="linkPage"><span jwcid="insertOtherPage"/></a>
- </span>
+<span jwcid="informal">
-</span>
+ <span jwcid="hiddenCurrentPage"/>
+ <span jwcid="hiddenPageCount"/>
+ <span jwcid="hiddenStartPage"/>
+ <span jwcid="hiddenStopPage"/>
+
+ <a jwcid="linkFirst"><<</a>
+ <a jwcid="linkBack"><</a>
+
+ <span jwcid="iterPage">
+
+ <span jwcid="condCurrent">
+ <b><span jwcid="insertCurrentPage"/></b>
+ </span>
-<a jwcid="linkFwd">></a>
-<a jwcid="linkLast">>></a>
+ <span jwcid="condOther">
+ <a jwcid="linkPage"><span jwcid="insertOtherPage"/></a>
+ </span>
+
+ </span>
+
+ <a jwcid="linkFwd">></a>
+ <a jwcid="linkLast">>></a>
+
+</span>
</span>
Modified:
jakarta/tapestry/branches/branch-3-0/contrib/src/org/apache/tapestry/contrib/table/components/TableFormPages.jwc
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/branches/branch-3-0/contrib/src/org/apache/tapestry/contrib/table/components/TableFormPages.jwc?rev=386648&r1=386647&r2=386648&view=diff
==============================================================================
---
jakarta/tapestry/branches/branch-3-0/contrib/src/org/apache/tapestry/contrib/table/components/TableFormPages.jwc
(original)
+++
jakarta/tapestry/branches/branch-3-0/contrib/src/org/apache/tapestry/contrib/table/components/TableFormPages.jwc
Fri Mar 17 06:57:32 2006
@@ -28,6 +28,8 @@
This component must be wrapped by TableView.
</description>
+ <component id="informal" type="Any" inherit-informal-parameters="yes"/>
+
<parameter name="pagesDisplayed"
type="int"
required="no"
Modified: jakarta/tapestry/branches/branch-3-0/status.xml
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/branches/branch-3-0/status.xml?rev=386648&r1=386647&r2=386648&view=diff
==============================================================================
--- jakarta/tapestry/branches/branch-3-0/status.xml (original)
+++ jakarta/tapestry/branches/branch-3-0/status.xml Fri Mar 17 06:57:32 2006
@@ -142,6 +142,15 @@
<action type="fix" dev="JK" fixes-bug="TAPESTRY-193" due-to="Brian K.
Wallace" >
AssetService not resolving file prefixes correctly.
</action>
+ <action type="fix" dev="JK" fixes-bug="TAPESTRY-774" due-to="Brian K.
Wallace" >
+ It seems that DirectLink and/or PopupLinkRenderer should be checking
for Form rewind and not rendering in that case.
+ </action>
+ <action type="fix" dev="JK" fixes-bug="TAPESTRY-221" due-to="Brian K.
Wallace" >
+ TableFormPages does not support inherited informal parameters that are
required to set the stylesheet class.
+ </action>
+ <action type="update" dev="JK" fixes-bug="TAPESTRY-310" due-to="Joni
Suoinen" >
+ Add finnish validation strings
+ </action>
</release>
<release version="3.0.3" date="Mar 26 2005">
<action type="fix" dev="PF" fixes-bug="TAPESTRY-278"> Fixes security
flaw in asset service. </action>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
