Manipulation: make wrapAll funarg execute only once

Fixes gh-1843
Closes gh-1912

diff --git a/src/wrap.js b/src/wrap.js
index 4958251d2ddf76c54579b89f618f1b2afc42470d..ee02aca758d6c7ad21f7f22f338ab3f77e7f4690 100644 (file)
--- a/src/wrap.js
+++ b/src/wrap.js
@@ -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 );

diff --git a/test/unit/wrap.js b/test/unit/wrap.js
index c75e02ff93ac8f8d8c1cd5c66d76f3ff50ebf880..9e9de43fadfc5f5450cf087417d29f66c87686bc 100644 (file)
--- a/test/unit/wrap.js
+++ b/test/unit/wrap.js
@@ -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 );