Manipulation: Support $el.html(selfRemovingScript) (#5378)

gibson042 · web-flow · commit 937923d9ee8d · 2024-01-08T18:30:39.000+01:00
Don't try to remove a script element that has already removed itself. Also, compress `DOMEval.js`. Fixes gh-5377 Closes gh-5378
diff --git a/src/core/DOMEval.js b/src/core/DOMEval.js
@@ -14,12 +14,13 @@ export function DOMEval( code, node, doc ) {
 		script = doc.createElement( "script" );
 
 	script.text = code;
-	if ( node ) {
-		for ( i in preservedScriptAttributes ) {
-			if ( node[ i ] ) {
-				script[ i ] = node[ i ];
-			}
+	for ( i in preservedScriptAttributes ) {
+		if ( node && node[ i ] ) {
+			script[ i ] = node[ i ];
 		}
 	}
-	doc.head.appendChild( script ).parentNode.removeChild( script );
+
+	if ( doc.head.appendChild( script ).parentNode ) {
+		script.parentNode.removeChild( script );
+	}
 }
diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js
@@ -1819,6 +1819,21 @@ QUnit.test( "html(script nomodule)", function( assert ) {
 	}, 1000 );
 } );
 
+QUnit.test( "html(self-removing script) (gh-5377)", function( assert ) {
+	assert.expect( 2 );
+
+	var $fixture = jQuery( "#qunit-fixture" );
+
+	$fixture.html(
+		[
+			"<script>document.currentScript.parentNode.removeChild( document.currentScript ); QUnit.assert.ok( true, 'removed document.currentScript' );</script>",
+			"<div>",
+				"<script>document.currentScript.parentNode.removeChild( document.currentScript ); QUnit.assert.ok( true, 'removed inner document.currentScript' );</script>",
+			"</div>"
+		].join( "" )
+	);
+} );
+
 QUnit.test( "html(Function) with incoming value -- direct selection", function( assert ) {
 
 	assert.expect( 4 );

Original file line number	Diff line number	Diff line change
`@@ -14,12 +14,13 @@ export function DOMEval( code, node, doc ) {`
`14`	`14`	`script = doc.createElement( "script" );`
`15`	`15`
`16`	`16`	`script.text = code;`
`17`		`- if ( node ) {`
`18`		`- for ( i in preservedScriptAttributes ) {`
`19`		`- if ( node[ i ] ) {`
`20`		`- script[ i ] = node[ i ];`
`21`		`- }`
	`17`	`+ for ( i in preservedScriptAttributes ) {`
	`18`	`+ if ( node && node[ i ] ) {`
	`19`	`+ script[ i ] = node[ i ];`
`22`	`20`	`}`
`23`	`21`	`}`
`24`		`- doc.head.appendChild( script ).parentNode.removeChild( script );`
	`22`	`+`
	`23`	`+ if ( doc.head.appendChild( script ).parentNode ) {`
	`24`	`+ script.parentNode.removeChild( script );`
	`25`	`+ }`
`25`	`26`	`}`