X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fmanipulation.js;h=9ed22baaf848ba2451fbf59e165828af6e189d8a;hb=4fa00369f00b8ee708c8962135b7aa345e3d30d0;hp=730dfca5e1296d299a05676f74f423845cd09202;hpb=600d3145386a9dca8143918cc3e339168f886a63;p=jquery.git

diff --git a/src/manipulation.js b/src/manipulation.js
index 730dfca..9ed22ba 100644
--- a/src/manipulation.js
+++ b/src/manipulation.js
@@ -173,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;
 
@@ -196,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 );
 		}