Revert "Manipulation: make wrapAll funarg execute only once"

This reverts commit 359b03cac74d7336676a6992f14b7ccab9b28659.

diff --git a/src/wrap.js b/src/wrap.js
index 32d1d331f2a885d57e9c230863d9acef555cea45..e43794448af1d94f492aa72946ae763efd87bb1c 100644 (file)
--- a/src/wrap.js
+++ b/src/wrap.js
@@ -9,10 +9,13 @@ 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 d7ba80d1723d5e5aefa49e0f42fec1b63409c10b..84f827db3699a66f954abddb55a6f58a0a185a21 100644 (file)
--- a/test/unit/wrap.js
+++ b/test/unit/wrap.js
@@ -206,58 +206,7 @@ QUnit.test( "wrapAll(String)", function( assert ) {
 
 } );
 
-QUnit.test( "wrapAll(Function)", function( assert ) {
-       assert.expect( 5 );
-
-       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>";
-               } );
-
-       assert.equal(
-               result.parent().length, 1, "Check for wrapping of on-the-fly html"
-       );
-       assert.ok(
-               jQuery( "#first" ).parent().parent().is( ".red" ), "Check if wrapper has class 'red'"
-       );
-       assert.ok(
-               jQuery( "#firstp" ).parent().parent().is( ".red" ), "Check if wrapper has class 'red'"
-       );
-       assert.ok(
-               jQuery( "#first" ).parent().parent().parent().is( p ), "Correct Parent"
-       );
-       assert.strictEqual(
-               jQuery( "#first" ).parent().parent()[ 0 ].previousSibling, prev, "Correct Previous Sibling"
-       );
-} );
-
-QUnit.test( "wrapAll(Function) check execution characteristics", function( assert ) {
-       assert.expect( 3 );
-
-       var i = 0;
-
-       jQuery( "non-existent" ).wrapAll( function() {
-               i++;
-               return "";
-       } );
-
-       assert.ok(
-               !i, "should not execute function argument if target element does not exist"
-       );
-
-       jQuery( "#firstp" ).wrapAll( function( index ) {
-               assert.strictEqual(
-               this, jQuery( "#firstp" )[ 0 ], "context must be the first found element"
-       );
-               assert.strictEqual(
-               index, undefined, "index argument should not be included in function execution"
-       );
-       } );
-} );
-
 QUnit.test( "wrapAll(Element)", function( assert ) {
-
   assert.expect( 3 );
 
   var prev, p;