You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by an...@apache.org on 2009/09/25 19:17:01 UTC
svn commit: r818919 - in /tapestry/tapestry4/trunk/tapestry-contrib/src:
java/org/apache/tapestry/contrib/link/ButtonLinkRenderer.java
test/org/apache/tapestry/contrib/link/TestButtonLinkRenderer.java
Author: andyhot
Date: Fri Sep 25 17:17:01 2009
New Revision: 818919
URL: http://svn.apache.org/viewvc?rev=818919&view=rev
Log:
TAPESTRY-2251 append existing onclick
Modified:
tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/link/ButtonLinkRenderer.java
tapestry/tapestry4/trunk/tapestry-contrib/src/test/org/apache/tapestry/contrib/link/TestButtonLinkRenderer.java
Modified: tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/link/ButtonLinkRenderer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/link/ButtonLinkRenderer.java?rev=818919&r1=818918&r2=818919&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/link/ButtonLinkRenderer.java (original)
+++ tapestry/tapestry4/trunk/tapestry-contrib/src/java/org/apache/tapestry/contrib/link/ButtonLinkRenderer.java Fri Sep 25 17:17:01 2009
@@ -57,15 +57,19 @@
writer.attribute("disabled", "disabled");
}
+ component.renderAdditionalAttributes(writer, cycle);
+
if (!cycle.isRewinding()) {
String url = link.getURL(component.getAnchor(), true);
String target = component.getTarget();
String onclick = (target == null) ? getScript(url) : getScript(url, target);
- writer.attribute("onclick", onclick);
+ if (writer.hasAttribute("onclick")) {
+ writer.appendAttribute("onclick", ";" + onclick);
+ } else {
+ writer.attribute("onclick", onclick);
+ }
}
-
- component.renderAdditionalAttributes(writer, cycle);
IMarkupWriter wrappedWriter = writer.getNestedWriter();
Modified: tapestry/tapestry4/trunk/tapestry-contrib/src/test/org/apache/tapestry/contrib/link/TestButtonLinkRenderer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-contrib/src/test/org/apache/tapestry/contrib/link/TestButtonLinkRenderer.java?rev=818919&r1=818918&r2=818919&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-contrib/src/test/org/apache/tapestry/contrib/link/TestButtonLinkRenderer.java (original)
+++ tapestry/tapestry4/trunk/tapestry-contrib/src/test/org/apache/tapestry/contrib/link/TestButtonLinkRenderer.java Fri Sep 25 17:17:01 2009
@@ -30,7 +30,7 @@
"class", "info");
assertLinkRenderer(linkRenderer, linkComponent,
- "<button type=\"button\" onclick=\"window.location='my.site'\" class=\"info\"></button>",
+ "<button type=\"button\" class=\"info\" onclick=\"window.location='my.site'\"></button>",
"");
}
@@ -41,11 +41,7 @@
"onclick", "alert('hi')");
assertLinkRenderer(linkRenderer, linkComponent,
- "<button type=\"button\" onclick=\"alert('hi')\"></button>",
- // TODO: correct is
- // "<button type=\"button\" onclick=\"window.location='my.site'\"></button>"
- // or even better (TAPESTRY-2251)
- // "<button type=\"button\" onclick=\"alert('hi');window.location='my.site'\"></button>"
+ "<button type=\"button\" onclick=\"alert('hi') ;window.location='my.site'\"></button>",
"");
}