deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Make sure that the contents of the element is still in place when html(Function) is called. Fixes #6733.

Browse source
This commit is contained in:
John Resig 2010-09-28 09:50:44 -07:00
parent e3c4e57897
commit 0368606c08
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/manipulation.js
View file

@ -248,10 +248,8 @@ jQuery.fn.extend({
} else if ( jQuery.isFunction( value ) ) { } else if ( jQuery.isFunction( value ) ) {
this.each(function(i){ this.each(function(i){
var self = jQuery(this), old = self.html(); var self = jQuery(this);
self.empty().append(function(){ self.html( value.call(this, i, self.html()) );
return value.call( this, i, old );
});
}); });
} else { } else {

11
test/unit/manipulation.js
View file

@ -955,6 +955,17 @@ test("html(String)", function() {
test("html(Function)", function() { test("html(Function)", function() {
testHtml(functionReturningObj); testHtml(functionReturningObj);
expect(33);
QUnit.reset();
jQuery("#main").html(function(){
return jQuery(this).text();
});
ok( !/</.test( jQuery("#main").html() ), "Replace html with text." );
ok( jQuery("#main").html().length > 0, "Make sure text exists." );
}); });
test("html(Function) with incoming value", function() { test("html(Function) with incoming value", function() {