]> source.dussan.org Git - jquery.git/commitdiff
Core: remove unnecessary support test for createHTMLDocument
authorTimmy Willison <timmywillisn@gmail.com>
Tue, 9 Dec 2014 20:57:12 +0000 (15:57 -0500)
committerTimmy Willison <timmywillisn@gmail.com>
Tue, 9 Dec 2014 20:57:12 +0000 (15:57 -0500)
src/core.js
src/core/parseHTML.js
src/core/support.js [deleted file]
test/unit/core.js
test/unit/support.js

index dab633f9c26c665fadccd6d7480c15fcf814aa47..fa8436a01220af92ad24914a4af1db0a78be30f1 100644 (file)
@@ -7,7 +7,7 @@ define([
        "./var/class2type",
        "./var/toString",
        "./var/hasOwn",
-       "./core/support"
+       "./var/support"
 ], function( arr, slice, concat, push, indexOf, class2type, toString, hasOwn, support ) {
 
 var
index c441b2b92ddb2d787ed7e4cb7d11072bafb6ed3a..f4448b7b1dd3b11d96125539a80fe5116a8df8af 100644 (file)
@@ -1,10 +1,9 @@
 define([
        "../core",
        "./var/rsingleTag",
-       "./support",
 
        "../manipulation" // buildFragment
-], function( jQuery, rsingleTag, support ) {
+], function( jQuery, rsingleTag ) {
 
 // data: string of html
 // context (optional): If specified, the fragment will be created in this context,
@@ -20,9 +19,7 @@ jQuery.parseHTML = function( data, context, keepScripts ) {
        }
        // document.implementation stops scripts or inline event handlers from
        // being executed immediately
-       context = context || ( support.createHTMLDocument ?
-               document.implementation.createHTMLDocument() :
-               document );
+       context = context || document.implementation.createHTMLDocument();
 
        var parsed = rsingleTag.exec( data ),
                scripts = !keepScripts && [];
diff --git a/src/core/support.js b/src/core/support.js
deleted file mode 100644 (file)
index d3ed33c..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-define([
-       "../var/support"
-], function( support ) {
-       // window.document is used here as it's before the sandboxed document
-       support.createHTMLDocument = !!window.document.implementation.createHTMLDocument;
-
-       return support;
-});
index ce3c3184de87012113b63f08615d875c82f6bc7a..c4c5ffa1aa768693e66df25265f532c527a712fe 100644 (file)
@@ -1370,23 +1370,19 @@ test("jQuery.parseHTML", function() {
        ok( jQuery.parseHTML("<#if><tr><p>This is a test.</p></tr><#/if>") || true, "Garbage input should not cause error" );
 });
 
-// This XSS test is optional, as it will only pass when `document.implementation.createHTMLDocument`
-// is implemented. This might not be the case for older Android browsers (<= 2.x).
-if ( document.implementation.createHTMLDocument ) {
-       asyncTest("jQuery.parseHTML", function() {
-               expect ( 1 );
+asyncTest("jQuery.parseHTML", function() {
+       expect ( 1 );
 
-               Globals.register("parseHTMLError");
+       Globals.register("parseHTMLError");
 
-               jQuery.globalEval("parseHTMLError = false;");
-               jQuery.parseHTML( "<img src=x onerror='parseHTMLError = true'>" );
+       jQuery.globalEval("parseHTMLError = false;");
+       jQuery.parseHTML( "<img src=x onerror='parseHTMLError = true'>" );
 
-               window.setTimeout(function() {
-                       start();
-                       equal( window.parseHTMLError, false, "onerror eventhandler has not been called." );
-               }, 2000);
-       });
-}
+       window.setTimeout(function() {
+               start();
+               equal( window.parseHTMLError, false, "onerror eventhandler has not been called." );
+       }, 2000);
+});
 
 test("jQuery.parseJSON", function() {
        expect( 20 );
index bed2c04144935de027c03c2e9cc240353e840d29..11f15a33b4ce87dc39bb5a45ca862060322308ae 100644 (file)
@@ -61,7 +61,6 @@ testIframeWithCallback( "Check CSP (https://developer.mozilla.org/en-US/docs/Sec
                        "checkOn": true,
                        "clearCloneStyle": true,
                        "cors": true,
-                       "createHTMLDocument": true,
                        "focusinBubbles": false,
                        "noCloneChecked": true,
                        "optDisabled": true,
@@ -78,7 +77,6 @@ testIframeWithCallback( "Check CSP (https://developer.mozilla.org/en-US/docs/Sec
                        "checkOn": true,
                        "clearCloneStyle": false,
                        "cors": true,
-                       "createHTMLDocument": true,
                        "focusinBubbles": true,
                        "noCloneChecked": false,
                        "optDisabled": true,
@@ -95,7 +93,6 @@ testIframeWithCallback( "Check CSP (https://developer.mozilla.org/en-US/docs/Sec
                        "checkOn": true,
                        "clearCloneStyle": false,
                        "cors": false,
-                       "createHTMLDocument": true,
                        "focusinBubbles": true,
                        "noCloneChecked": false,
                        "optDisabled": true,
@@ -112,7 +109,6 @@ testIframeWithCallback( "Check CSP (https://developer.mozilla.org/en-US/docs/Sec
                        "checkOn": true,
                        "clearCloneStyle": true,
                        "cors": true,
-                       "createHTMLDocument": true,
                        "focusinBubbles": false,
                        "noCloneChecked": true,
                        "optDisabled": true,
@@ -129,7 +125,6 @@ testIframeWithCallback( "Check CSP (https://developer.mozilla.org/en-US/docs/Sec
                        "checkOn": true,
                        "clearCloneStyle": true,
                        "cors": true,
-                       "createHTMLDocument": true,
                        "focusinBubbles": false,
                        "noCloneChecked": true,
                        "optDisabled": true,
@@ -146,7 +141,6 @@ testIframeWithCallback( "Check CSP (https://developer.mozilla.org/en-US/docs/Sec
                        "checkOn": true,
                        "clearCloneStyle": true,
                        "cors": true,
-                       "createHTMLDocument": true,
                        "focusinBubbles": false,
                        "noCloneChecked": true,
                        "optDisabled": true,
@@ -163,7 +157,6 @@ testIframeWithCallback( "Check CSP (https://developer.mozilla.org/en-US/docs/Sec
                        "checkOn": false,
                        "clearCloneStyle": true,
                        "cors": true,
-                       "createHTMLDocument": true,
                        "focusinBubbles": false,
                        "noCloneChecked": true,
                        "optDisabled": true,
@@ -180,7 +173,6 @@ testIframeWithCallback( "Check CSP (https://developer.mozilla.org/en-US/docs/Sec
                        "checkOn": false,
                        "clearCloneStyle": false,
                        "cors": true,
-                       "createHTMLDocument": true,
                        "focusinBubbles": false,
                        "noCloneChecked": true,
                        "optDisabled": false,