From: <asa...@us...> - 2013-01-05 07:24:27
|
Revision: 7935 http://sourceforge.net/p/htmlunit/code/7935 Author: asashour Date: 2013-01-05 07:24:24 +0000 (Sat, 05 Jan 2013) Log Message: ----------- Handle pages with "application/javascript" content type as JavaScriptPage. Modified Paths: -------------- trunk/htmlunit/src/changes/changes.xml trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/DefaultPageCreator.java trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/DefaultPageCreatorTest.java Modified: trunk/htmlunit/src/changes/changes.xml =================================================================== --- trunk/htmlunit/src/changes/changes.xml 2013-01-03 19:16:49 UTC (rev 7934) +++ trunk/htmlunit/src/changes/changes.xml 2013-01-05 07:24:24 UTC (rev 7935) @@ -8,6 +8,9 @@ <body> <release version="2.12" date="???" description="Bugfixes, CSS3 Selectors"> + <action type="fix" dev="asashour" issue="1471"> + Handle pages with "application/javascript" content type as JavaScriptPage. + </action> <action type="add" dev="asashour"> CSS: support Selectors Level 3. </action> Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/DefaultPageCreator.java =================================================================== --- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/DefaultPageCreator.java 2013-01-03 19:16:49 UTC (rev 7934) +++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/DefaultPageCreator.java 2013-01-05 07:24:24 UTC (rev 7935) @@ -112,7 +112,8 @@ return PageType.HTML; } - if ("text/javascript".equals(contentType) || "application/x-javascript".equals(contentType)) { + if ("text/javascript".equals(contentType) || "application/x-javascript".equals(contentType) + || "application/javascript".equals(contentType)) { return PageType.JAVASCRIPT; } Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/DefaultPageCreatorTest.java =================================================================== --- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/DefaultPageCreatorTest.java 2013-01-03 19:16:49 UTC (rev 7934) +++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/DefaultPageCreatorTest.java 2013-01-05 07:24:24 UTC (rev 7935) @@ -56,6 +56,7 @@ assertEquals(PageType.JAVASCRIPT, DefaultPageCreator.determinePageType("text/javascript")); assertEquals(PageType.JAVASCRIPT, DefaultPageCreator.determinePageType("application/x-javascript")); + assertEquals(PageType.JAVASCRIPT, DefaultPageCreator.determinePageType("application/javascript")); assertEquals(PageType.XML, DefaultPageCreator.determinePageType("text/xml")); assertEquals(PageType.XML, DefaultPageCreator.determinePageType("application/xml")); |