svn commit: r1138605 - /wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpander.java

[jdonnerstag]

Author: jdonnerstag
Date: Wed Jun 22 20:09:20 2011
New Revision: 1138605

URL: http://svn.apache.org/viewvc?rev=1138605&view=rev
Log:
fixed: Consistently create body for short tags.
Issue: WICKET-2650

Modified:
    
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpander.java

Modified: 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpander.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpander.java?rev=1138605&r1=1138604&r2=1138605&view=diff
==============================================================================
--- 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpander.java
 (original)
+++ 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpander.java
 Wed Jun 22 20:09:20 2011
@@ -40,11 +40,26 @@ public class OpenCloseTagExpander extend
        private static final List<String> replaceForTags = Arrays.asList("a", 
"q", "sub", "sup",
                "abbr", "acronym", "cite", "code", "del", "dfn", "em", "ins", 
"kbd", "samp", "var",
                "label", "textarea", "tr", "td", "th", "caption", "thead", 
"tbody", "tfoot", "dl", "dt",
-               "dd", "li", "ol", "ul", "h1", "h2", "h3", "h4", "h5", "h6", 
"pre", "title", "div"
+               "dd", "li", "ol", "ul", "h1", "h2", "h3", "h4", "h5", "h6",
+               "pre",
+               "title",
+               "div",
 
                // tags from pre 1.5 days, shouldnt really be here but make 
this release more backwards
                // compatible
-               , "span", "p", "strong", "b", "e", "select", "col");
+               "span", "p",
+               "strong",
+               "b",
+               "e",
+               "select",
+               "col",
+
+               // New HTML5 elements (exlucding: open-close tags:
+               // wbr, source, time, embed, keygen
+               // @TODO by now an exclude list is probably shorter
+               "article", "aside", "command", "details", "summary", "figure", 
"figcaption", "footer",
+               "header", "hgroup", "mark", "meter", "nav", "progress", "ruby", 
"rt", "rp", "section",
+               "audio", "video", "canvas", "datalist", "output");
 
        // temporary storage. Introduce into flow on next request
        private ComponentTag next = null;