Core: remove unnecessary support test for createHTMLDocument

jquery · Dec 9, 2014 · 59232825aa87b941dd2418a6860b64017dfec0ae · 5923282
1 parent 6051609
commit 59232825aa87b941dd2418a6860b64017dfec0ae
Unified Split

Showing with 13 additions and 36 deletions.

+1 −1 src/core.js

+2 −5 src/core/parseHTML.js

+0 −8 src/core/support.js

+10 −14 test/unit/core.js

+0 −8 test/unit/support.js
diff --git a/src/core.js b/src/core.js
@@ -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

diff --git a/src/core/parseHTML.js b/src/core/parseHTML.js
@@ -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
diff --git a/test/unit/core.js b/test/unit/core.js
@@ -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 );

diff --git a/test/unit/support.js b/test/unit/support.js
@@ -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,