Merge branch 'master' of git@github.com:jquery/jquery

This commit is contained in:
John Resig 2009-12-06 15:51:15 -08:00
commit 1fe9ff5482
3 changed files with 7 additions and 4 deletions

View file

@ -151,7 +151,7 @@ test("unwrap()", function() {
});
var testAppend = function(valueObj) {
expect(21);
expect(22);
var defaultText = 'Try them out:'
var result = jQuery('#first').append(valueObj('<b>buga</b>'));
equals( result.text(), defaultText + 'buga', 'Check if text appending works' );
@ -224,6 +224,8 @@ var testAppend = function(valueObj) {
t( "Append Select", "#appendSelect1, #appendSelect2", ["appendSelect1", "appendSelect2"] );
equals( "Two nodes", jQuery('<div />').append("Two", " nodes").text(), "Appending two text nodes (#4011)" );
// using contents will get comments regular, text, and comment nodes
var j = jQuery("#nonnodes").contents();
var d = jQuery("<div/>").appendTo("#nonnodes").append(j);