[HtmlUnit] SVN: [8667] trunk/htmlunit/src

[<rb...@us...>]

Revision: 8667
          http://sourceforge.net/p/htmlunit/code/8667
Author:   rbri
Date:     2013-10-19 12:10:53 +0000 (Sat, 19 Oct 2013)
Log Message:
-----------
more HTMLElement class fixes 

Modified Paths:
--------------
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBlockElement.java
    trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLSpanElement.java
    trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlSpanTest.java

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBlockElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBlockElement.java	2013-10-19 11:57:27 UTC (rev 8666)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLBlockElement.java	2013-10-19 12:10:53 UTC (rev 8667)
@@ -17,7 +17,10 @@
 import static com.gargoylesoftware.htmlunit.BrowserVersionFeatures.JS_BLOCK_COMMON_CLASS_NAME;
 
 import com.gargoylesoftware.htmlunit.html.DomNode;
+import com.gargoylesoftware.htmlunit.html.HtmlAddress;
 import com.gargoylesoftware.htmlunit.html.HtmlCenter;
+import com.gargoylesoftware.htmlunit.html.HtmlExample;
+import com.gargoylesoftware.htmlunit.html.HtmlListing;
 import com.gargoylesoftware.htmlunit.html.HtmlPlainText;
 import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
 import com.gargoylesoftware.htmlunit.javascript.host.ActiveXObject;
@@ -28,7 +31,12 @@
  * @version $Revision$
  * @author Ronald Brill
  */
-@JsxClass(domClasses = { HtmlCenter.class, HtmlPlainText.class })
+@JsxClass(domClasses = {
+        HtmlAddress.class,
+        HtmlCenter.class,
+        HtmlExample.class,
+        HtmlListing.class,
+        HtmlPlainText.class })
 public class HTMLBlockElement extends HTMLElement {
 
     /**
@@ -95,4 +103,18 @@
         }
         return super.getClassName();
     }
+
+    /**
+     * <span style="color:red">INTERNAL API - SUBJECT TO CHANGE AT ANY TIME - USE AT YOUR OWN RISK.</span><br/>
+     * {@inheritDoc}
+    */
+    @Override
+    public String getDefaultStyleDisplay() {
+        final String tagName = getTagName();
+        if ("ADDRESS".equals(tagName)
+                || "CENTER".equals(tagName)) {
+            return super.getDefaultStyleDisplay();
+        }
+        return "inline";
+    }
 }

Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLSpanElement.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLSpanElement.java	2013-10-19 11:57:27 UTC (rev 8666)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLSpanElement.java	2013-10-19 12:10:53 UTC (rev 8667)
@@ -18,13 +18,9 @@
 
 import com.gargoylesoftware.htmlunit.BrowserVersion;
 import com.gargoylesoftware.htmlunit.html.DomNode;
-import com.gargoylesoftware.htmlunit.html.HtmlAddress;
-import com.gargoylesoftware.htmlunit.html.HtmlExample;
-import com.gargoylesoftware.htmlunit.html.HtmlListing;
 import com.gargoylesoftware.htmlunit.html.HtmlMultiColumn;
 import com.gargoylesoftware.htmlunit.html.HtmlSpan;
 import com.gargoylesoftware.htmlunit.javascript.configuration.JsxClass;
-import com.gargoylesoftware.htmlunit.javascript.host.ActiveXObject;
 
 /**
  * The JavaScript object "HTMLSpanElement".
@@ -35,11 +31,8 @@
  * @author Ronald Brill
  */
 @JsxClass(domClasses = {
-        HtmlAddress.class,
-        HtmlListing.class,
         HtmlMultiColumn.class,
-        HtmlSpan.class,
-        HtmlExample.class })
+        HtmlSpan.class })
 public class HTMLSpanElement extends HTMLElement {
     private boolean endTagForbidden_;
 
@@ -58,12 +51,6 @@
 
             return;
         }
-
-        if (domNode instanceof HtmlAddress
-            || domNode instanceof HtmlExample
-            || domNode instanceof HtmlListing) {
-            ActiveXObject.addProperty(this, "cite", true, true);
-        }
     }
 
     /**
@@ -125,11 +112,6 @@
     */
     @Override
     public String getDefaultStyleDisplay() {
-        final String tagName = getTagName();
-        if ("ADDRESS".equals(tagName)
-                || "CENTER".equals(tagName)) {
-            return super.getDefaultStyleDisplay();
-        }
         return "inline";
     }
 }

Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlSpanTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlSpanTest.java	2013-10-19 11:57:27 UTC (rev 8666)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlSpanTest.java	2013-10-19 12:10:53 UTC (rev 8667)
@@ -56,7 +56,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(FF = "[object HTMLSpanElement]", IE = "[object]")
+    @Alerts(FF = "[object HTMLElement]", IE = "[object]")
     public void simpleScriptable_others() throws Exception {
         final String html = "<html><head>\n"
             + "<script>\n"