Simplify .wrapAll() and fix style. Close gh-1116.

diff --git a/src/manipulation.js b/src/manipulation.js
index 9aea16f9df6bf0bf8dc8c58f042a593831f555ff..0ceb9ac8888ac7abd874aa44bd57c5dd7c81903e 100644 (file)
--- a/src/manipulation.js
+++ b/src/manipulation.js
@@ -29,30 +29,33 @@ jQuery.fn.extend({
                return jQuery.access( this, function( value ) {
                        return value === undefined ?
                                jQuery.text( this ) :
-                               this.empty().append( ( this[0] && this[0].ownerDocument || document ).createTextNode( value ) );
+                               this.empty().append( ( this[ 0 ] && this[ 0 ].ownerDocument || document ).createTextNode( value ) );
                }, null, value, arguments.length );
        },
 
        wrapAll: function( html ) {
+               var wrap;
+
                if ( jQuery.isFunction( html ) ) {
-                       return this.each(function(i) {
-                               jQuery(this).wrapAll( html.call(this, i) );
+                       return this.each(function( i ) {
+                               jQuery( this ).wrapAll( html.call(this, i) );
                        });
                }
 
-               if ( this[0] ) {
+               if ( this[ 0 ] ) {
+
                        // The elements to wrap the target around
-                       var wrap = jQuery( html, this[0].ownerDocument ).eq(0).clone(true);
+                       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() {
                                var elem = this;
 
-                               while ( elem.firstChild && elem.firstChild.nodeType === 1 ) {
-                                       elem = elem.firstChild;
+                               while ( elem.firstElementChild ) {
+                                       elem = elem.firstElementChild;
                                }
 
                                return elem;
@@ -188,7 +191,7 @@ jQuery.fn.extend({
 
        html: function( value ) {
                return jQuery.access( this, function( value ) {
-                       var elem = this[0] || {},
+                       var elem = this[ 0 ] || {},
                                i = 0,
                                l = this.length;