Menu
▾
▴
[HtmlUnit] SVN: [8390] trunk/htmlunit/src
|
From: <rb...@us...> - 2013-07-11 16:48:59
|
Revision: 8390
http://sourceforge.net/p/htmlunit/code/8390
Author: rbri
Date: 2013-07-11 16:48:56 +0000 (Thu, 11 Jul 2013)
Log Message:
-----------
last default 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-07-11 13:28:40 UTC (rev 8389)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclaration.java 2013-07-11 16:48:56 UTC (rev 8390)
@@ -174,7 +174,7 @@
map.put("MARK", "inline");
map.put("METER", "inline");
map.put("NAV", "inline");
- // map.put("NOSCRIPT", "inline");
+ map.put("NOSCRIPT", "inline");
map.put("OBJECT", "inline");
map.put("OPTGROUP", "inline");
map.put("OPTION", "inline");
@@ -231,7 +231,7 @@
map.put("LEGEND", "block");
map.put("METER", "inline-block");
map.put("NAV", "block");
- // map.put("NOSCRIPT", "none");
+ map.put("NOSCRIPT", "none");
map.put("OPTGROUP", "block");
map.put("OPTION", "block");
map.put("PARAM", "none");
@@ -683,12 +683,19 @@
}
private String getDefaultStyleDisplay() {
+ final String tagName = getElement().getTagName();
+ if ("NOSCRIPT".equals(tagName)) {
+ final DomNode node = getDomNodeOrNull();
+ if (node != null && !node.getPage().getWebClient().getOptions().isJavaScriptEnabled()) {
+ return "block";
+ }
+ }
+
Map<String, String> map = DEFAULT_DISPLAYS;
if (getBrowserVersion().hasFeature(CSS_DISPLAY_DEFAULT)) {
map = DEFAULT_DISPLAYS_CSS;
}
- final String tagName = getElement().getTagName();
final String defaultValue = map.get(tagName);
if (defaultValue == null) {
return "block";
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-07-11 13:28:40 UTC (rev 8389)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/css/ComputedCSSStyleDeclarationTest.java 2013-07-11 16:48:56 UTC (rev 8390)
@@ -680,7 +680,6 @@
@Test
@Alerts(DEFAULT = { "block", "none", "inline", "block", "block", "block", "inline" },
IE = { "inline", "inline", "inline", "block", "inline", "inline", "inline" })
- @NotYetImplemented
public void defaultDisplayValues_NO() throws Exception {
final String html = "<!DOCTYPE HTML>\n<html><body>\n"
+ " <nav id='nav'>\n"
|
