Commit937923d

authored

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

Don't try to remove a script element that has already removed itself.Also, compress `DOMEval.js`.Fixesgh-5377Closesgh-5378

1 parente8b7db4 commit937923dCopy full SHA for 937923d

File tree

+22

-6

lines changed

+22

-6

lines changed

Lines changed: 7 additions & 6 deletions

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(iinpreservedScriptAttributes){`
`19`		`-if(node[i]){`
`20`		`-script[i]=node[i];`
`21`		`-}`
	`17`	`+for(iinpreservedScriptAttributes){`
	`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`	`}`

Lines changed: 15 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1819,6 +1819,21 @@ QUnit.test( "html(script nomodule)", function( assert ) {`
`1819`	`1819`	`},1000);`
`1820`	`1820`	`});`
`1821`	`1821`
	`1822`	`+QUnit.test("html(self-removing script) (gh-5377)",function(assert){`
	`1823`	`+assert.expect(2);`
	`1824`	`+`
	`1825`	`+var$fixture=jQuery("#qunit-fixture");`
	`1826`	`+`
	`1827`	`+$fixture.html(`
	`1828`	`+[`
	`1829`	`+"<script>document.currentScript.parentNode.removeChild( document.currentScript ); QUnit.assert.ok( true, 'removed document.currentScript' );</script>",`
	`1830`	`+"<div>",`
	`1831`	`+"<script>document.currentScript.parentNode.removeChild( document.currentScript ); QUnit.assert.ok( true, 'removed inner document.currentScript' );</script>",`
	`1832`	`+"</div>"`
	`1833`	`+].join("")`
	`1834`	`+);`
	`1835`	`+});`
	`1836`	`+`
`1822`	`1837`	`QUnit.test("html(Function) with incoming value -- direct selection",function(assert){`
`1823`	`1838`
`1824`	`1839`	`assert.expect(4);`

Comments

(0)