X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fmanipulation.js;h=f2f6c7de6d37d2ba7ea2399e0b1420e437b8b327;hb=36a98b95c2f3f7617ddf51beec7515acf67d98ba;hp=730dfca5e1296d299a05676f74f423845cd09202;hpb=600d3145386a9dca8143918cc3e339168f886a63;p=jquery.git diff --git a/src/manipulation.js b/src/manipulation.js index 730dfca..f2f6c7d 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 ); } @@ -208,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 );