deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed wrapping of elements that hold text nodes. Thanks to David Flanagan for the patch. Fixes #4902.

Browse source
This commit is contained in:
John Resig 2009-07-14 23:28:07 +00:00
parent ad5ba1a72e
commit 991dafae16
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/manipulation.js
View file

@ -32,7 +32,7 @@ jQuery.fn.extend({
wrap.map(function(){ wrap.map(function(){
var elem = this; var elem = this;
while ( elem.firstChild ) while ( elem.firstChild && elem.firstChild.nodeType === 1 )
elem = elem.firstChild; elem = elem.firstChild;
return elem; return elem;

7
test/unit/manipulation.js
View file

@ -10,7 +10,7 @@ test("text()", function() {
}); });
var testWrap = function(val) { var testWrap = function(val) {
expect(10); expect(12);
var defaultText = 'Try them out:' var defaultText = 'Try them out:'
var result = jQuery('#first').wrap(val( '<div class="red"><span></span></div>' )).text(); var result = jQuery('#first').wrap(val( '<div class="red"><span></span></div>' )).text();
equals( defaultText, result, 'Check for wrapping of on-the-fly html' ); equals( defaultText, result, 'Check for wrapping of on-the-fly html' );
@ -40,6 +40,11 @@ var testWrap = function(val) {
j = jQuery("<label/>").wrap(val( "<li/>" )); j = jQuery("<label/>").wrap(val( "<li/>" ));
equals( j[0].nodeName.toUpperCase(), "LABEL", "Element is a label" ); equals( j[0].nodeName.toUpperCase(), "LABEL", "Element is a label" );
equals( j[0].parentNode.nodeName.toUpperCase(), "LI", "Element has been wrapped" ); equals( j[0].parentNode.nodeName.toUpperCase(), "LI", "Element has been wrapped" );
// Wrap an element containing a text node
j = jQuery("<span/>").wrap("<div>test</div>");
equals( j[0].previousSibling.nodeType, 3, "Make sure the previous node is a text element" );
equals( j[0].parentNode.nodeName.toUpperCase(), "DIV", "And that we're in the div element." );
} }
test("wrap(String|Element)", function() { test("wrap(String|Element)", function() {