Standardize on using double-quotes for string literals.

[jquery.git] / src / manipulation.js

diff --git a/src/manipulation.js b/src/manipulation.js
index 9103111..5109cf0 100644 (file)
--- a/src/manipulation.js
+++ b/src/manipulation.js
@@ -1,12 +1,12 @@
 var rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g,
        rleadingWhitespace = /^\s+/,
        rxhtmlTag = /(<([\w:]+)[^>]*?)\/>/g,
-       rselfClosing = /^(?:abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i,
+       rselfClosing = /^(?:area|br|col|embed|hr|img|input|link|meta|param)$/i,
        rtagName = /<([\w:]+)/,
        rtbody = /<tbody/i,
        rhtml = /<|&\w+;/,
-       fcloseTag = function(all, front, tag){
-               return rselfClosing.test(tag) ?
+       fcloseTag = function( all, front, tag ) {
+               return rselfClosing.test( tag ) ?
                        all :
                        front + "></" + tag + ">";
        },
@@ -32,24 +32,17 @@ if ( !jQuery.support.htmlSerialize ) {
 
 jQuery.fn.extend({
        text: function( text ) {
+               if ( jQuery.isFunction(text) ) {
+                       return this.each(function() {
+                               return jQuery(this).text( text.call(this) );
+                       });
+               }
+
                if ( typeof text !== "object" && text !== undefined ) {
                        return this.empty().append( (this[0] && this[0].ownerDocument || document).createTextNode( text ) );
                }
 
-               var ret = "";
-
-               jQuery.each( this, function() {
-                       // Get the text from text nodes and CDATA nodes
-                       if ( this.nodeType === 3 || this.nodeType === 4 ) {
-                               ret += this.nodeValue;
-
-                       // Traverse everything else, except comment nodes
-                       } else if ( this.nodeType !== 8 ) {
-                               ret += jQuery.fn.text.call( this.childNodes );
-                       }
-               });
-
-               return ret;
+               return jQuery.getText( this );
        },
 
        wrapAll: function( html ) {
@@ -61,13 +54,13 @@ jQuery.fn.extend({
 
                if ( this[0] ) {
                        // The elements to wrap the target around
-                       var wrap = jQuery( html, this[0].ownerDocument ).eq(0).clone();
+                       var wrap = jQuery( html, this[0].ownerDocument ).eq(0).clone(true);
 
                        if ( this[0].parentNode ) {
                                wrap.insertBefore( this[0] );
                        }
 
-                       wrap.map(function(){
+                       wrap.map(function() {
                                var elem = this;
 
                                while ( elem.firstChild && elem.firstChild.nodeType === 1 ) {
@@ -82,27 +75,27 @@ jQuery.fn.extend({
        },
 
        wrapInner: function( html ) {
-               return this.each(function(){
+               return this.each(function() {
                        jQuery( this ).contents().wrapAll( html );
                });
        },
 
        wrap: function( html ) {
-               return this.each(function(){
+               return this.each(function() {
                        jQuery( this ).wrapAll( html );
                });
        },
 
        unwrap: function() {
-               return this.parent().each(function(){
+               return this.parent().each(function() {
                        if ( !jQuery.nodeName( this, "body" ) ) {
                                jQuery( this ).replaceWith( this.childNodes );
                        }
                }).end();
        },
-       
+
        append: function() {
-               return this.domManip(arguments, true, function(elem){
+               return this.domManip(arguments, true, function( elem ) {
                        if ( this.nodeType === 1 ) {
                                this.appendChild( elem );
                        }
@@ -110,7 +103,7 @@ jQuery.fn.extend({
        },
 
        prepend: function() {
-               return this.domManip(arguments, true, function(elem){
+               return this.domManip(arguments, true, function( elem ) {
                        if ( this.nodeType === 1 ) {
                                this.insertBefore( elem, this.firstChild );
                        }
@@ -119,7 +112,7 @@ jQuery.fn.extend({
 
        before: function() {
                if ( this[0] && this[0].parentNode ) {
-                       return this.domManip(arguments, false, function(elem){
+                       return this.domManip(arguments, false, function( elem ) {
                                this.parentNode.insertBefore( elem, this );
                        });
                } else if ( arguments.length ) {
@@ -131,7 +124,7 @@ jQuery.fn.extend({
 
        after: function() {
                if ( this[0] && this[0].parentNode ) {
-                       return this.domManip(arguments, false, function(elem){
+                       return this.domManip(arguments, false, function( elem ) {
                                this.parentNode.insertBefore( elem, this.nextSibling );
                        });
                } else if ( arguments.length ) {
@@ -143,7 +136,7 @@ jQuery.fn.extend({
 
        clone: function( events ) {
                // Do the clone
-               var ret = this.map(function(){
+               var ret = this.map(function() {
                        if ( !jQuery.support.noCloneEvent && !jQuery.isXMLDoc(this) ) {
                                // IE copies events bound via attachEvent when
                                // using cloneNode. Calling detachEvent on the
@@ -211,7 +204,7 @@ jQuery.fn.extend({
 
        replaceWith: function( value ) {
                if ( this[0] && this[0].parentNode ) {
-                       return this.each(function(){
+                       return this.each(function() {
                                var next = this.nextSibling, parent = this.parentNode;
 
                                jQuery(this).remove();
@@ -285,22 +278,16 @@ jQuery.fn.extend({
 function cloneCopyEvent(orig, ret) {
        var i = 0;
 
-       ret.each(function(){
-               if ( this.nodeName !== orig[i].nodeName ) {
+       ret.each(function() {
+               if ( this.nodeName !== (orig[i] && orig[i].nodeName) ) {
                        return;
                }
 
-               var events = jQuery.data( orig[i], "events" );
-
-               for ( var type in events ) {
-                       for ( var handler in events[ type ] ) {
-                               jQuery.event.add( this, type, events[ type ][ handler ], events[ type ][ handler ].data );
-                       }
-               }
+               jQuery.data( this, jQuery.data( orig[i++] ) );
        });
 }
 
-function buildFragment(args, nodes, scripts){
+function buildFragment( args, nodes, scripts ) {
        var fragment, cacheable, cached, cacheresults, doc;
 
        if ( args.length === 1 && typeof args[0] === "string" && args[0].length < 512 && args[0].indexOf("<option") < 0 ) {
@@ -335,7 +322,7 @@ jQuery.each({
        insertBefore: "before",
        insertAfter: "after",
        replaceAll: "replaceWith"
-}, function(name, original){
+}, function( name, original ) {
        jQuery.fn[ name ] = function( selector ) {
                var ret = [], insert = jQuery( selector );
 
@@ -374,8 +361,8 @@ jQuery.each({
                        this.removeChild( this.firstChild );
                }
        }
-}, function(name, fn){
-       jQuery.fn[ name ] = function(){
+}, function( name, fn ) {
+       jQuery.fn[ name ] = function() {
                return this.each( fn, arguments );
        };
 });
@@ -391,12 +378,14 @@ jQuery.extend({
 
                var ret = [];
 
-               jQuery.each(elems, function(i, elem){
+               jQuery.each(elems, function( i, elem ) {
                        if ( typeof elem === "number" ) {
-                               elem += '';
+                               elem += "";
                        }
 
-                       if ( !elem ) { return; }
+                       if ( !elem ) {
+                               return;
+                       }
 
                        // Convert html string into DOM nodes
                        if ( typeof elem === "string" && !rhtml.test( elem ) ) {
@@ -429,7 +418,7 @@ jQuery.extend({
                                                        div.firstChild && div.firstChild.childNodes :
 
                                                        // String was a bare <thead> or <tfoot>
-                                                       wrap[1] == "<table>" && !hasBody ?
+                                                       wrap[1] === "<table>" && !hasBody ?
                                                                div.childNodes :
                                                                [];
 
@@ -476,7 +465,7 @@ jQuery.extend({
 
 function cleanData( elems ) {
        for ( var i = 0, elem, id; (elem = elems[i]) != null; i++ ) {
-               if ( (id = elem[expando]) ) {
+               if ( !jQuery.noData[elem.nodeName.toLowerCase()] && (id = elem[expando]) ) {
                        delete jQuery.cache[ id ];
                }
        }