Revert "Manipulation: make wrapAll funarg execute only once"

This reverts commit 3dcee021603d5c25cd429cb25c2de5046044ca4c.

diff --git a/src/wrap.js b/src/wrap.js
index e2e28746c00cee1ef4994902976f77f401e0cb5e..7740defa19bf339f4408d81a5170d1d7eb87745a 100644 (file)
--- a/src/wrap.js
+++ b/src/wrap.js
@@ -7,18 +7,18 @@ define( [
 
 jQuery.fn.extend( {
        wrapAll: function( html ) {
-               var wrap;
-
-               if ( this[ 0 ] ) {
-                       if ( jQuery.isFunction( html ) ) {
-                               html = html.call( this[ 0 ] );
-                       }
+               if ( jQuery.isFunction( html ) ) {
+                       return this.each(function(i) {
+                               jQuery(this).wrapAll( html.call(this, i) );
+                       });
+               }
 
+               if ( this[0] ) {
                        // The elements to wrap the target around
-                       wrap = jQuery( html, this[ 0 ].ownerDocument ).eq( 0 ).clone( true );
+                       var wrap = jQuery( html, this[0].ownerDocument ).eq(0).clone(true);
 
-                       if ( this[ 0 ].parentNode ) {
-                               wrap.insertBefore( this[ 0 ] );
+                       if ( this[0].parentNode ) {
+                               wrap.insertBefore( this[0] );
                        }
 
                        wrap.map( function() {

diff --git a/test/unit/wrap.js b/test/unit/wrap.js
index 28077f3a3e1e8078badf5a9c46a6f8ab67d3aeac..3fa9c438a60f5c971f6ff4b7025500d203d54af9 100644 (file)
--- a/test/unit/wrap.js
+++ b/test/unit/wrap.js
@@ -212,106 +212,6 @@ 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(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 );