You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2007/06/18 06:03:48 UTC
svn commit: r548199 -
/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java
Author: ivaynberg
Date: Sun Jun 17 21:03:47 2007
New Revision: 548199
URL: http://svn.apache.org/viewvc?view=rev&rev=548199
Log:
WICKET-614: Markup ids from markup should be honored for CSS reasons, even with outputMarkupId == true
Modified:
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java?view=diff&rev=548199&r1=548198&r2=548199
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java Sun Jun 17 21:03:47 2007
@@ -3185,7 +3185,7 @@
*/
protected void onComponentTag(final ComponentTag tag)
{
- if (getFlag(FLAG_OUTPUT_MARKUP_ID))
+ if (getFlag(FLAG_OUTPUT_MARKUP_ID) && !tag.getAttributes().containsKey(MARKUP_ID_ATTR_NAME))
{
tag.put(MARKUP_ID_ATTR_NAME, getMarkupId());
}