Commita75d6b5

authored and

committed

Core: Fix regression in jQuery.text() on HTMLDocument objects

Fixesgh-5264Closesgh-5265(cherry picked from commit44c56f8)

1 parent338de35 commita75d6b5Copy full SHA for a75d6b5

File tree

+12

-4

lines changed

+12

-4

lines changed

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -271,9 +271,14 @@ jQuery.extend( {`
`271`	`271`	`// Do not traverse comment nodes`
`272`	`272`	`ret+=jQuery.text(node);`
`273`	`273`	`}`
`274`		`-}elseif(nodeType===1\|\|nodeType===9\|\|nodeType===11){`
	`274`	`+}`
	`275`	`+if(nodeType===1\|\|nodeType===11){`
`275`	`276`	`returnelem.textContent;`
`276`		`-}elseif(nodeType===3\|\|nodeType===4){`
	`277`	`+}`
	`278`	`+if(nodeType===9){`
	`279`	`+returnelem.documentElement.textContent;`
	`280`	`+}`
	`281`	`+if(nodeType===3\|\|nodeType===4){`
`277`	`282`	`returnelem.nodeValue;`
`278`	`283`	`}`
`279`	`284`

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -30,9 +30,9 @@ function manipulationFunctionReturningObj( value ) {`
`30`	`30`
`31`	`31`	`QUnit.test("text()",function(assert){`
`32`	`32`
`33`		`-assert.expect(5);`
	`33`	`+assert.expect(6);`
`34`	`34`
`35`		`-varexpected,frag,$newLineTest;`
	`35`	`+varexpected,frag,$newLineTest,doc;`
`36`	`36`
`37`	`37`	`expected="This link has class=\"blog\": Simon Willison's Weblog";`
`38`	`38`	`assert.equal(jQuery("#sap").text(),expected,"Check for merged text of more then one element.");`
`@@ -52,6 +52,9 @@ QUnit.test( "text()", function( assert ) {`
`52`	`52`	`assert.equal($newLineTest.text(),"test\ntesty","text() does not remove new lines (trac-11153)");`
`53`	`53`
`54`	`54`	`$newLineTest.remove();`
	`55`	`+`
	`56`	`+doc=newDOMParser().parseFromString("<span>example</span>","text/html");`
	`57`	`+assert.equal(jQuery(doc).text(),"example","text() on HTMLDocument (gh-5264)");`
`55`	`58`	`});`
`56`	`59`
`57`	`60`	`QUnit.test("text(undefined)",function(assert){`

Comments

(0)