Permalink
Browse files

Manipulation: make wrapAll funarg execute only once

Fixes gh-1843
Closes gh-1912
  • Loading branch information...
markelog committed Dec 8, 2014
1 parent 6f65f5f commit 359b03cac74d7336676a6992f14b7ccab9b28659
Showing with 33 additions and 6 deletions.
  1. +3 −6 src/wrap.js
  2. +30 −0 test/unit/wrap.js
View
@@ -9,13 +9,10 @@ jQuery.fn.extend({
wrapAll: function( html ) {
var wrap;
if ( jQuery.isFunction( html ) ) {
return this.each(function( i ) {
jQuery( this ).wrapAll( html.call(this, i) );
});
}
if ( this[ 0 ] ) {
if ( jQuery.isFunction( html ) ) {
html = html.call( this[ 0 ] );
}
// The elements to wrap the target around
wrap = jQuery( html, this[ 0 ].ownerDocument ).eq( 0 ).clone( true );
View
@@ -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() {
expect( 3 );

0 comments on commit 359b03c

Please sign in to comment.