You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2013/02/27 17:03:00 UTC

[1/2] git commit: WICKET-5062 Update the list of HTML void elements with the latest HTML5 ones

WICKET-5062 Update the list of HTML void elements with the latest HTML5 ones


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/9d2376d5
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/9d2376d5
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/9d2376d5

Branch: refs/heads/master
Commit: 9d2376d515f5e87643a738229c34bad8de2b8400
Parents: 114068e
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Feb 27 18:02:15 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Feb 27 18:02:15 2013 +0200

----------------------------------------------------------------------
 .../wicket/markup/parser/filter/HtmlHandler.java   |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/9d2376d5/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/HtmlHandler.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/HtmlHandler.java b/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/HtmlHandler.java
index 440e5bc..0d007c1 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/HtmlHandler.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/HtmlHandler.java
@@ -51,6 +51,9 @@ public final class HtmlHandler extends AbstractMarkupFilter
 	static
 	{
 		// Tags which are allowed not be closed in HTML
+		// http://www.w3.org/TR/html5/syntax.html#void-elements
+
+		// HTML5 doesn't allow void <p> but we should keep it for backward compatibility
 		doesNotRequireCloseTag.put("p", Boolean.TRUE);
 		doesNotRequireCloseTag.put("br", Boolean.TRUE);
 		doesNotRequireCloseTag.put("img", Boolean.TRUE);
@@ -58,6 +61,16 @@ public final class HtmlHandler extends AbstractMarkupFilter
 		doesNotRequireCloseTag.put("hr", Boolean.TRUE);
 		doesNotRequireCloseTag.put("link", Boolean.TRUE);
 		doesNotRequireCloseTag.put("meta", Boolean.TRUE);
+		doesNotRequireCloseTag.put("area", Boolean.TRUE);
+		doesNotRequireCloseTag.put("base", Boolean.TRUE);
+		doesNotRequireCloseTag.put("col", Boolean.TRUE);
+		doesNotRequireCloseTag.put("command", Boolean.TRUE);
+		doesNotRequireCloseTag.put("embed", Boolean.TRUE);
+		doesNotRequireCloseTag.put("keygen", Boolean.TRUE);
+		doesNotRequireCloseTag.put("param", Boolean.TRUE);
+		doesNotRequireCloseTag.put("source", Boolean.TRUE);
+		doesNotRequireCloseTag.put("track", Boolean.TRUE);
+		doesNotRequireCloseTag.put("wbr", Boolean.TRUE);
 	}
 
 	/**