Menu
▾
▴
[HtmlUnit] SVN: [8363] trunk/htmlunit/src
|
From: <rb...@us...> - 2013-06-30 15:53:49
|
Revision: 8363
http://sourceforge.net/p/htmlunit/code/8363
Author: rbri
Date: 2013-06-30 15:53:44 +0000 (Sun, 30 Jun 2013)
Log Message:
-----------
more defaults for the display property fixed
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclaration.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclaration.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclaration.java 2013-06-30 15:43:20 UTC (rev 8362)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclaration.java 2013-06-30 15:53:44 UTC (rev 8363)
@@ -156,6 +156,10 @@
map.put("LABEL", "inline");
map.put("LEGEND", "inline");
map.put("LI", "list-item");
+ map.put("MAP", "inline");
+ map.put("MARK", "inline");
+ map.put("METER", "inline");
+
map.put("SPAN", "inline");
map.put("TABLE", "table");
@@ -178,6 +182,7 @@
map.put("HEADER", "block");
map.put("INPUT", "inline");
map.put("LEGEND", "block");
+ map.put("METER", "inline-block");
DEFAULT_DISPLAYS_CSS = Collections.unmodifiableMap(map);
}
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.java 2013-06-30 15:43:20 UTC (rev 8362)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.java 2013-06-30 15:53:44 UTC (rev 8363)
@@ -627,6 +627,47 @@
* @throws Exception if an error occurs
*/
@Test
+ @Alerts(DEFAULT = { "inline", "inline", "block", "inline-block" },
+ IE = { "inline", "inline", "block", "inline" })
+ public void defaultDisplayValues_M() throws Exception {
+ final String html = "<!DOCTYPE HTML>\n<html><body>\n"
+ + " <img usemap='#imgmap'>\n"
+ + " <map id='map' name='imgmap'>\n"
+ + " <area id='area'>\n"
+ + " </map>\n"
+ + " </img>\n"
+
+ + " <p id='p'>\n"
+ + " <mark id='mark'></mark>\n"
+ + " </p>\n"
+
+ + " <menu id='menu'>\n"
+ + " <li id='li'></li>\n"
+ + " </menu>\n"
+
+ + " <meter id='meter'></meter>\n"
+
+ + " <script>\n"
+ + " function x(id) {\n"
+ + " var e = document.getElementById(id);\n"
+ + " return e.currentStyle ? e.currentStyle.display : window.getComputedStyle(e, '').display;\n"
+ + " }\n"
+ + " </script>\n"
+ + " <script>\n"
+ + " alert(x('map'));\n"
+ + " alert(x('mark'));\n"
+ + " alert(x('menu'));\n"
+ + " alert(x('meter'));\n"
+
+ + " </script>\n"
+ + "</body></html>";
+ loadPageWithAlerts2(html);
+ }
+
+ /**
+ * @throws Exception if an error occurs
+ */
+ @Test
@Alerts("table table-header-group table-row-group table-cell table-row table-cell block list-item")
public void defaultDisplayValuesTable() throws Exception {
final String html = "<!DOCTYPE HTML>\n<html><body>\n"
|
