Author: ivaynberg
Date: Fri Sep 21 08:58:50 2007
New Revision: 578187
URL: http://svn.apache.org/viewvc?rev=578187&view=rev
Log:
WICKET-995: getMarkupId generates ID which contains special characters which
should be escaped or replaced
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java?rev=578187&r1=578186&r2=578187&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java
(original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Component.java
Fri Sep 21 08:58:50 2007
@@ -1212,6 +1212,10 @@
if (!Character.isLetter(c))
{
markupId = "id" + markupId;
+ // escape some noncompliant characters
+ markupId = markupId.replace("_", "__");
+ markupId = markupId.replace('.', '_');
+ markupId = markupId.replace('-', '_');
}
// }
Modified:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html?rev=578187&r1=578186&r2=578187&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html
Fri Sep 21 08:58:50 2007
@@ -9,7 +9,7 @@
</head><body>
<div wicket:id="hideable"><wicket:border>
<a href="#" wicket:id="hideLink" onclick="var
wcall=wicketAjaxGet('?wicket:interface=:0:hideable:hideLink::IBehaviorListener:0:',null,null,
function() {return Wicket.$$(this)}.bind(this));return !wcall;"
id="hideLink1">Hide contents</a>
- <wicket:body id="id_body2">
+ <wicket:body id="id__body2">
Contents
</wicket:body>
</wicket:border></div>
