Menu
▾
▴
[HtmlUnit] SVN: [7756] trunk/htmlunit/src
|
From: <asa...@us...> - 2012-11-23 07:17:20
|
Revision: 7756
http://sourceforge.net/p/htmlunit/code/7756
Author: asashour
Date: 2012-11-23 07:17:17 +0000 (Fri, 23 Nov 2012)
Log Message:
-----------
Properly handle spaces after "em" element.
Issue 1463
Modified Paths:
--------------
trunk/htmlunit/src/changes/changes.xml
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HTMLParser.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HTMLParser2Test.java
Modified: trunk/htmlunit/src/changes/changes.xml
===================================================================
--- trunk/htmlunit/src/changes/changes.xml 2012-11-22 19:18:55 UTC (rev 7755)
+++ trunk/htmlunit/src/changes/changes.xml 2012-11-23 07:17:17 UTC (rev 7756)
@@ -8,6 +8,9 @@
<body>
<release version="2.12" date="???" description="Bugfixes">
+ <action type="fix" dev="asashour" issue="1463">
+ Properly handle spaces after "em" element.
+ </action>
<action type="fix" dev="asashour" issue="1452">
JavaScript: element.outerHTML should throw an error if the provided value closes the parent.
</action>
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HTMLParser.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HTMLParser.java 2012-11-22 19:18:55 UTC (rev 7755)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/html/HTMLParser.java 2012-11-23 07:17:17 UTC (rev 7756)
@@ -660,7 +660,8 @@
if (node.getFirstChild() != null
&& (node instanceof HtmlAnchor || node instanceof HtmlSpan || node instanceof HtmlFont
|| node instanceof HtmlStrong || node instanceof HtmlBold
- || node instanceof HtmlItalic || node instanceof HtmlUnderlined)) {
+ || node instanceof HtmlItalic || node instanceof HtmlUnderlined
+ || node instanceof HtmlEmphasis)) {
return false;
}
}
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HTMLParser2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HTMLParser2Test.java 2012-11-22 19:18:55 UTC (rev 7755)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HTMLParser2Test.java 2012-11-23 07:17:17 UTC (rev 7756)
@@ -441,4 +441,28 @@
loadPageWithAlerts2(html);
}
+ /**
+ * @throws Exception on test failure
+ */
+ @Test
+ @Alerts(IE = { "1", "1", "1", "2", "2", "1" }, FF = { "3", "2", "2", "3", "2", "2" })
+ public void childNodes_em() throws Exception {
+ final String html = "<html><head><title>test_getChildNodes</title>\n"
+ + "<script>\n"
+ + "function test() {\n"
+ + " for (var i = 1; i <= 6; i++) {\n"
+ + " alert(document.getElementById('p' + i).childNodes.length);\n"
+ + " }\n"
+ + "}\n"
+ + "</script>\n"
+ + "</head><body onload='test()'>\n"
+ + "<p id='p1'> <em></em> </p>\n"
+ + "<p id='p2'><em></em> </p>\n"
+ + "<p id='p3'> <em></em></p>\n"
+ + "<p id='p4'> <em>something</em> </p>\n"
+ + "<p id='p5'><em>something</em> </p>\n"
+ + "<p id='p6'> <em>something</em></p>\n"
+ + "</body></html>";
+ loadPageWithAlerts2(html);
+ }
}
|
