X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fmanipulation.js;h=cfb9c9d61c4d0dbc2ff2a4b8fd2561a827e6a1c2;hb=209751fcbd8a42eef68df44c875763b6af8a5474;hp=a8cb484bbd8e667e338d47fc37c5a45dd36931c3;hpb=3f7fc25494988ee5be66c0af0d552b24f0ca1b79;p=jquery.git

diff --git a/src/manipulation.js b/src/manipulation.js
index a8cb484..cfb9c9d 100644
--- a/src/manipulation.js
+++ b/src/manipulation.js
@@ -1,7 +1,7 @@
 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+;/,
@@ -32,6 +32,12 @@ 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 ) );
 		}
@@ -48,7 +54,7 @@ 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] );
@@ -87,7 +93,7 @@ jQuery.fn.extend({
 			}
 		}).end();
 	},
-	
+
 	append: function() {
 		return this.domManip(arguments, true, function(elem){
 			if ( this.nodeType === 1 ) {
@@ -273,17 +279,11 @@ function cloneCopyEvent(orig, ret) {
 	var i = 0;
 
 	ret.each(function(){
-		if ( this.nodeName !== orig[i].nodeName ) {
+		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++] ) );
 	});
 }
 
@@ -463,7 +463,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 ];
 		}
 	}