X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fmanipulation.js;h=17cfa842dc6d9f48ac389cdd5701233e728aa214;hb=616aceef84dca3960f6b78680f41bdcf85fa7838;hp=0c2753e968200c98c7b983ebfaf58f649740ded9;hpb=f5b649fafbd85a1973a9c46ca6bf163d9de857a7;p=jquery.git

diff --git a/src/manipulation.js b/src/manipulation.js
index 0c2753e..17cfa84 100644
--- a/src/manipulation.js
+++ b/src/manipulation.js
@@ -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 ) );
 		}
@@ -87,7 +93,7 @@ jQuery.fn.extend({
 			}
 		}).end();
 	},
-	
+
 	append: function() {
 		return this.domManip(arguments, true, function(elem){
 			if ( this.nodeType === 1 ) {
@@ -277,13 +283,7 @@ function cloneCopyEvent(orig, ret) {
 			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++] ) );
 	});
 }