X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fmanipulation.js;h=f2f6c7de6d37d2ba7ea2399e0b1420e437b8b327;hb=36a98b95c2f3f7617ddf51beec7515acf67d98ba;hp=27bc0b46b600cfdd032be6837eb78e40a4db41e7;hpb=7d0c18034e1a7967c1aabc84e66e6fd020cd541d;p=jquery.git

diff --git a/src/manipulation.js b/src/manipulation.js
index 27bc0b4..f2f6c7d 100644
--- a/src/manipulation.js
+++ b/src/manipulation.js
@@ -33,8 +33,9 @@ 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) );
+			return this.each(function(i) {
+				var self = jQuery(this);
+				return self.text( text.call(this, i, self.text()) );
 			});
 		}
 
@@ -47,8 +48,8 @@ jQuery.fn.extend({
 
 	wrapAll: function( html ) {
 		if ( jQuery.isFunction( html ) ) {
-			return this.each(function() {
-				jQuery(this).wrapAll( html.apply(this, arguments) );
+			return this.each(function(i) {
+				jQuery(this).wrapAll( html.call(this, i) );
 			});
 		}
 
@@ -172,7 +173,7 @@ jQuery.fn.extend({
 
 	html: function( value ) {
 		if ( value === undefined ) {
-			return this[0] ?
+			return this[0] && this[0].nodeType === 1 ?
 				this[0].innerHTML.replace(rinlinejQuery, "") :
 				null;
 
@@ -195,6 +196,14 @@ jQuery.fn.extend({
 				this.empty().append( value );
 			}
 
+		} else if ( jQuery.isFunction( value ) ) {
+			this.each(function(i){
+				var self = jQuery(this), old = self.html();
+				self.empty().append(function(){
+					return value.call( this, i, old );
+				});
+			});
+
 		} else {
 			this.empty().append( value );
 		}
@@ -207,7 +216,7 @@ jQuery.fn.extend({
 			return this.each(function() {
 				var next = this.nextSibling, parent = this.parentNode;
 
-				jQuery(this).remove();
+				jQuery(this).detach();
 
 				if ( next ) {
 					jQuery(next).before( value );
@@ -228,9 +237,10 @@ jQuery.fn.extend({
 		var results, first, value = args[0], scripts = [];
 
 		if ( jQuery.isFunction(value) ) {
-			return this.each(function() {
-				args[0] = value.call(this);
-				return jQuery(this).domManip( args, table, callback );
+			return this.each(function(i) {
+				var self = jQuery(this);
+				args[0] = value.call(this, i, table ? self.html() : undefined);
+				return self.domManip( args, table, callback );
 			});
 		}
 
@@ -283,7 +293,7 @@ function cloneCopyEvent(orig, ret) {
 			return;
 		}
 
-		var oldData = jQuery.data( orig[i++] ), curData = jQuery.data( this, oldData ), events = oldData.events;
+		var oldData = jQuery.data( orig[i++] ), curData = jQuery.data( this, oldData ), events = oldData && oldData.events;
 
 		if ( events ) {
 			delete curData.handle;