mirror of
https://github.com/jquery/jquery.git
synced 2024-10-05 11:34:18 +00:00
Manipulation: make wrapAll funarg execute only once
Fixes gh-1843 Closes gh-1912
This commit is contained in:
parent
6f65f5faf2
commit
359b03cac7
@ -9,13 +9,10 @@ jQuery.fn.extend({
|
|||||||
wrapAll: function( html ) {
|
wrapAll: function( html ) {
|
||||||
var wrap;
|
var wrap;
|
||||||
|
|
||||||
if ( jQuery.isFunction( html ) ) {
|
|
||||||
return this.each(function( i ) {
|
|
||||||
jQuery( this ).wrapAll( html.call(this, i) );
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( this[ 0 ] ) {
|
if ( this[ 0 ] ) {
|
||||||
|
if ( jQuery.isFunction( html ) ) {
|
||||||
|
html = html.call( this[ 0 ] );
|
||||||
|
}
|
||||||
|
|
||||||
// The elements to wrap the target around
|
// The elements to wrap the target around
|
||||||
wrap = jQuery( html, this[ 0 ].ownerDocument ).eq( 0 ).clone( true );
|
wrap = jQuery( html, this[ 0 ].ownerDocument ).eq( 0 ).clone( true );
|
||||||
|
@ -148,6 +148,36 @@ test( "wrapAll(String)", function() {
|
|||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test( "wrapAll(Function)", 5, function() {
|
||||||
|
var prev = jQuery( "#firstp" )[ 0 ].previousSibling,
|
||||||
|
p = jQuery( "#firstp,#first" )[ 0 ].parentNode,
|
||||||
|
result = jQuery( "#firstp,#first" ).wrapAll(function() {
|
||||||
|
return "<div class='red'><div class='tmp'></div></div>";
|
||||||
|
});
|
||||||
|
|
||||||
|
equal( result.parent().length, 1, "Check for wrapping of on-the-fly html" );
|
||||||
|
ok( jQuery( "#first" ).parent().parent().is( ".red" ), "Check if wrapper has class 'red'" );
|
||||||
|
ok( jQuery( "#firstp" ).parent().parent().is( ".red" ), "Check if wrapper has class 'red'" );
|
||||||
|
ok( jQuery( "#first" ).parent().parent().parent().is( p ), "Correct Parent" );
|
||||||
|
strictEqual( jQuery( "#first" ).parent().parent()[ 0 ].previousSibling, prev, "Correct Previous Sibling" );
|
||||||
|
});
|
||||||
|
|
||||||
|
test( "wrapAll(Function) check execution characteristics", 3, function() {
|
||||||
|
var i = 0;
|
||||||
|
|
||||||
|
jQuery( "non-existent" ).wrapAll(function() {
|
||||||
|
i++;
|
||||||
|
return "";
|
||||||
|
});
|
||||||
|
|
||||||
|
ok( !i, "should not execute function argument if target element does not exist" );
|
||||||
|
|
||||||
|
jQuery( "#firstp" ).wrapAll(function( index ) {
|
||||||
|
strictEqual( this, jQuery( "#firstp" )[ 0 ], "context must be the first found element" );
|
||||||
|
strictEqual( index, undefined, "index argument should not be included in function execution" );
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
test( "wrapAll(Element)", function() {
|
test( "wrapAll(Element)", function() {
|
||||||
|
|
||||||
expect( 3 );
|
expect( 3 );
|
||||||
|
Loading…
Reference in New Issue
Block a user