[prev in list] [next in list] [prev in thread] [next in thread]
List: htmlunit-develop
Subject: [HtmlUnit] SF.net SVN: htmlunit:[6801] trunk/htmlunit/src
From: RBRi () users ! sourceforge ! net
Date: 2012-03-31 16:39:18
Message-ID: E1SE1Kg-0000ap-JG () sfp-svn-6 ! v30 ! ch3 ! sourceforge ! com
[Download RAW message or body]
Revision: 6801
http://htmlunit.svn.sourceforge.net/htmlunit/?rev=6801&view=rev
Author: RBRi
Date: 2012-03-31 16:39:18 +0000 (Sat, 31 Mar 2012)
Log Message:
-----------
cleanup and some fixes for FF10
Modified Paths:
--------------
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/DocumentType.java
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDocument.java
trunk/htmlunit/src/main/resources/com/gargoylesoftware/htmlunit/javascript/configuration/FF3.6.properties
trunk/htmlunit/src/main/resources/com/gargoylesoftware/htmlunit/javascript/configuration/FF3.properties
trunk/htmlunit/src/main/resources/com/gargoylesoftware/htmlunit/javascript/configuration/IE6.properties
trunk/htmlunit/src/main/resources/com/gargoylesoftware/htmlunit/javascript/configuration/IE7.properties
trunk/htmlunit/src/main/resources/com/gargoylesoftware/htmlunit/javascript/configuration/IE8.properties
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/DocumentTypeTest.java
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java 2012-03-31 \
11:16:13 UTC (rev 6800)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/BrowserVersionFeatures.java 2012-03-31 \
16:39:18 UTC (rev 6801) @@ -314,12 +314,6 @@
GENERATED_32,
/** Was originally .isIE(). */
- GENERATED_33,
-
- /** Was originally .isIE(). */
- GENERATED_34,
-
- /** Was originally .isIE(). */
GENERATED_35,
/** Was originally .isIE(). */
@@ -395,9 +389,6 @@
GENERATED_63,
/** Was originally .isIE(). */
- GENERATED_64,
-
- /** Was originally .isIE(). */
GENERATED_65,
/** Was originally .isIE(). */
@@ -611,6 +602,21 @@
/** */
JS_DEFERRED,
+ /** Javascript doctyp.entities returns an empty string (IE). */
+ JS_DOCTYPE_ENTITIES_EMPTY_STRING,
+
+ /** Javascript doctyp.entities returns null (FF10). */
+ JS_DOCTYPE_ENTITIES_NULL,
+
+ /** Javascript doctyp.internalSubset returns an empty string (IE). */
+ JS_DOCTYPE_INTERNALSUBSET_EMPTY_STRING,
+
+ /** Javascript doctyp.notations returns an empty string (IE). */
+ JS_DOCTYPE_NOTATIONS_EMPTY_STRING,
+
+ /** Javascript doctyp.notations returns null (FF10). */
+ JS_DOCTYPE_NOTATIONS_NULL,
+
/** Javascript document.appendChild is allowed (IE). */
JS_DOCUMENT_APPEND_CHILD_SUPPORTED,
@@ -620,6 +626,9 @@
*/
JS_DOCUMENT_CREATE_ELEMENT_EXTENDED_SYNTAX,
+ /** Javascript document.doctype returns null (IE). */
+ JS_DOCUMENT_DOCTYPE_NULL,
+
/** Javascript property document.domain is lowercase. */
JS_DOCUMENT_DOMAIN_IS_LOWERCASE,
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/DocumentType.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/DocumentType.java 2012-03-31 \
11:16:13 UTC (rev 6800)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/DocumentType.java 2012-03-31 \
16:39:18 UTC (rev 6801) @@ -14,6 +14,11 @@
*/
package com.gargoylesoftware.htmlunit.javascript.host;
+import org.apache.commons.lang3.StringUtils;
+import org.w3c.dom.NamedNodeMap;
+
+import net.sourceforge.htmlunit.corejs.javascript.Context;
+
import com.gargoylesoftware.htmlunit.BrowserVersionFeatures;
import com.gargoylesoftware.htmlunit.html.DomDocumentType;
@@ -68,28 +73,52 @@
* @return the internal subset
*/
public String jsxGet_internalSubset() {
- return ((DomDocumentType) getDomNodeOrDie()).getInternalSubset();
+ final String subset = ((DomDocumentType) \
getDomNodeOrDie()).getInternalSubset(); + if (StringUtils.isNotEmpty(subset)) \
{ + return subset;
+ }
+
+ if (getBrowserVersion().hasFeature(BrowserVersionFeatures.JS_DOCTYPE_INTERNALSUBSET_EMPTY_STRING)) \
{ + return "";
+ }
+ return null;
}
/**
* Returns entities.
* @return entities
*/
- public String jsxGet_entities() {
- if (getBrowserVersion().hasFeature(BrowserVersionFeatures.GENERATED_33)) {
+ public Object jsxGet_entities() {
+ final NamedNodeMap entities = ((DomDocumentType) \
getDomNodeOrDie()).getEntities(); + if (null != entities) {
+ return entities;
+ }
+
+ if (getBrowserVersion().hasFeature(BrowserVersionFeatures.JS_DOCTYPE_ENTITIES_NULL)) \
{ + return null;
+ }
+ if (getBrowserVersion().hasFeature(BrowserVersionFeatures.JS_DOCTYPE_ENTITIES_EMPTY_STRING)) \
{ return "";
}
- return null;
+ return Context.getUndefinedValue();
}
/**
* Returns notations.
* @return notations
*/
- public String jsxGet_notations() {
- if (getBrowserVersion().hasFeature(BrowserVersionFeatures.GENERATED_34)) {
+ public Object jsxGet_notations() {
+ final NamedNodeMap notations = ((DomDocumentType) \
getDomNodeOrDie()).getNotations(); + if (null != notations) {
+ return notations;
+ }
+
+ if (getBrowserVersion().hasFeature(BrowserVersionFeatures.JS_DOCTYPE_NOTATIONS_NULL)) \
{ + return null;
+ }
+ if (getBrowserVersion().hasFeature(BrowserVersionFeatures.JS_DOCTYPE_NOTATIONS_EMPTY_STRING)) \
{ return "";
}
- return null;
+ return Context.getUndefinedValue();
}
}
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDocument.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDocument.java 2012-03-31 \
11:16:13 UTC (rev 6800)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/javascript/host/html/HTMLDocument.java 2012-03-31 \
16:39:18 UTC (rev 6801) @@ -1623,7 +1623,7 @@
*/
@Override
public SimpleScriptable jsxGet_doctype() {
- if (getBrowserVersion().hasFeature(BrowserVersionFeatures.GENERATED_64)) {
+ if (getBrowserVersion().hasFeature(BrowserVersionFeatures.JS_DOCUMENT_DOCTYPE_NULL)) \
{ return null;
}
return super.jsxGet_doctype();
Modified: trunk/htmlunit/src/main/resources/com/gargoylesoftware/htmlunit/javascript/configuration/FF3.6.properties
===================================================================
--- trunk/htmlunit/src/main/resources/com/gargoylesoftware/htmlunit/javascript/configuration/FF3.6.properties 2012-03-31 \
11:16:13 UTC (rev 6800)
+++ trunk/htmlunit/src/main/resources/com/gargoylesoftware/htmlunit/javascript/configuration/FF3.6.properties 2012-03-31 \
16:39:18 UTC (rev 6801) @@ -43,6 +43,8 @@
JS_ALIGN_ACCEPTS_ARBITRARY_VALUES
JS_CHAR_OFF_INTEGER
JS_CHAR_UNDEFINED_DOT
+JS_DOCTYPE_ENTITIES_NULL
+JS_DOCTYPE_NOTATIONS_NULL
JS_DOCUMENT_DOMAIN_IS_LOWERCASE
JS_ECMA5_FUNCTIONS
JS_FRAME_RESOLVE_URL_WITH_PARENT_WINDOW
Modified: trunk/htmlunit/src/main/resources/com/gargoylesoftware/htmlunit/javascript/configuration/FF3.properties
===================================================================
--- trunk/htmlunit/src/main/resources/com/gargoylesoftware/htmlunit/javascript/configuration/FF3.properties 2012-03-31 \
11:16:13 UTC (rev 6800)
+++ trunk/htmlunit/src/main/resources/com/gargoylesoftware/htmlunit/javascript/configuration/FF3.properties 2012-03-31 \
16:39:18 UTC (rev 6801) @@ -42,6 +42,9 @@
JS_ALIGN_ACCEPTS_ARBITRARY_VALUES
JS_CHAR_OFF_INTEGER
JS_CHAR_UNDEFINED_DOT
+JS_DOCTYPE_ENTITIES_NULL
+JS_DOCTYPE_INTERNALSUBSET_EMPTY_STRING
+JS_DOCTYPE_NOTATIONS_NULL
JS_DOCUMENT_DOMAIN_IS_LOWERCASE
JS_FRAME_RESOLVE_URL_WITH_PARENT_WINDOW
JS_FUNCTION_TOSOURCE
Modified: trunk/htmlunit/src/main/resources/com/gargoylesoftware/htmlunit/javascript/configuration/IE6.properties
===================================================================
--- trunk/htmlunit/src/main/resources/com/gargoylesoftware/htmlunit/javascript/configuration/IE6.properties 2012-03-31 \
11:16:13 UTC (rev 6800)
+++ trunk/htmlunit/src/main/resources/com/gargoylesoftware/htmlunit/javascript/configuration/IE6.properties 2012-03-31 \
16:39:18 UTC (rev 6801) @@ -54,8 +54,6 @@
GENERATED_30
GENERATED_31
GENERATED_32
-GENERATED_33
-GENERATED_34
GENERATED_35
GENERATED_36
GENERATED_37
@@ -81,7 +79,6 @@
GENERATED_60
GENERATED_61
GENERATED_63
-GENERATED_64
GENERATED_65
GENERATED_66
GENERATED_69
@@ -130,8 +127,11 @@
JS_CLIENT_LEFT_TOP_ZERO
JS_CLONE_NODE_COPIES_EVENT_LISTENERS
JS_DEFERRED
+JS_DOCTYPE_ENTITIES_EMPTY_STRING
+JS_DOCTYPE_NOTATIONS_EMPTY_STRING
JS_DOCUMENT_APPEND_CHILD_SUPPORTED
JS_DOCUMENT_CREATE_ELEMENT_EXTENDED_SYNTAX
+JS_DOCUMENT_DOCTYPE_NULL
JS_DOCUMENT_FORMS_FUNCTION_SUPPORTED
JS_DOCUMENT_SETTING_DOMAIN_THROWS_FOR_ABOUT_BLANK
JS_ELEMENT_EXTENT_WITHOUT_PADDING
Modified: trunk/htmlunit/src/main/resources/com/gargoylesoftware/htmlunit/javascript/configuration/IE7.properties
===================================================================
--- trunk/htmlunit/src/main/resources/com/gargoylesoftware/htmlunit/javascript/configuration/IE7.properties 2012-03-31 \
11:16:13 UTC (rev 6800)
+++ trunk/htmlunit/src/main/resources/com/gargoylesoftware/htmlunit/javascript/configuration/IE7.properties 2012-03-31 \
16:39:18 UTC (rev 6801) @@ -53,8 +53,6 @@
GENERATED_30
GENERATED_31
GENERATED_32
-GENERATED_33
-GENERATED_34
GENERATED_35
GENERATED_36
GENERATED_37
@@ -80,7 +78,6 @@
GENERATED_60
GENERATED_61
GENERATED_63
-GENERATED_64
GENERATED_65
GENERATED_66
GENERATED_69
@@ -129,8 +126,11 @@
JS_CLIENT_LEFT_TOP_ZERO
JS_CLONE_NODE_COPIES_EVENT_LISTENERS
JS_DEFERRED
+JS_DOCTYPE_ENTITIES_EMPTY_STRING
+JS_DOCTYPE_NOTATIONS_EMPTY_STRING
JS_DOCUMENT_APPEND_CHILD_SUPPORTED
JS_DOCUMENT_CREATE_ELEMENT_EXTENDED_SYNTAX
+JS_DOCUMENT_DOCTYPE_NULL
JS_DOCUMENT_FORMS_FUNCTION_SUPPORTED
JS_DOCUMENT_SETTING_DOMAIN_THROWS_FOR_ABOUT_BLANK
JS_ELEMENT_EXTENT_WITHOUT_PADDING
Modified: trunk/htmlunit/src/main/resources/com/gargoylesoftware/htmlunit/javascript/configuration/IE8.properties
===================================================================
--- trunk/htmlunit/src/main/resources/com/gargoylesoftware/htmlunit/javascript/configuration/IE8.properties 2012-03-31 \
11:16:13 UTC (rev 6800)
+++ trunk/htmlunit/src/main/resources/com/gargoylesoftware/htmlunit/javascript/configuration/IE8.properties 2012-03-31 \
16:39:18 UTC (rev 6801) @@ -54,8 +54,6 @@
GENERATED_30
GENERATED_31
GENERATED_32
-GENERATED_33
-GENERATED_34
GENERATED_35
GENERATED_36
GENERATED_37
@@ -81,7 +79,6 @@
GENERATED_60
GENERATED_61
GENERATED_63
-GENERATED_64
GENERATED_65
GENERATED_66
GENERATED_69
@@ -131,8 +128,11 @@
JS_CLIENT_LEFT_TOP_ZERO
JS_CLONE_NODE_COPIES_EVENT_LISTENERS
JS_DEFERRED
+JS_DOCTYPE_ENTITIES_EMPTY_STRING
+JS_DOCTYPE_NOTATIONS_EMPTY_STRING
JS_DOCUMENT_APPEND_CHILD_SUPPORTED
JS_DOCUMENT_CREATE_ELEMENT_EXTENDED_SYNTAX
+JS_DOCUMENT_DOCTYPE_NULL
JS_DOCUMENT_FORMS_FUNCTION_SUPPORTED
JS_DOCUMENT_SETTING_DOMAIN_THROWS_FOR_ABOUT_BLANK
JS_ELEMENT_EXTENT_WITHOUT_PADDING
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/DocumentTypeTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/DocumentTypeTest.java 2012-03-31 \
11:16:13 UTC (rev 6800)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/DocumentTypeTest.java 2012-03-31 \
16:39:18 UTC (rev 6801) @@ -87,7 +87,6 @@
FF = {
"[object DocumentType]", "greeting,10,null,null,null,null",
"greeting,MyIdentifier,hello.dtd,null,undefined,undefined" })
- @NotYetImplemented(Browser.FF3_6)
public void doctype_xml() throws Exception {
final String html =
"<html>\n"
This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.
------------------------------------------------------------------------------
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here
http://p.sf.net/sfu/sfd2d-msazure
_______________________________________________
HtmlUnit-develop mailing list
HtmlUnit-develop@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/htmlunit-develop
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic