From: Colin Snover Date: Sun, 12 Dec 2010 08:39:06 +0000 (-0600) Subject: Merge branch 'bug5566' into csnover-bug5566. Fixes #4386, #5566, #6997. X-Git-Url: http://git.asbjorn.biz/?p=jquery.git;a=commitdiff_plain;h=4fae75d575b20d887e4a273c7991c55f8821a62c Merge branch 'bug5566' into csnover-bug5566. Fixes #4386, #5566, #6997. Conflicts: src/manipulation.js test/unit/manipulation.js --- 4fae75d575b20d887e4a273c7991c55f8821a62c diff --cc test/unit/manipulation.js index 4805016,71a501a..29c79a2 --- a/test/unit/manipulation.js +++ b/test/unit/manipulation.js @@@ -814,7 -848,7 +848,7 @@@ test("replaceAll(String|Element|Array&l }); test("clone()", function() { - expect(32); - expect(35); ++ expect(36); equals( 'This is a normal link: Yahoo', jQuery('#en').text(), 'Assert text for #en' ); var clone = jQuery('#yahoo').clone(); equals( 'Try them out:Yahoo', jQuery('#first').append(clone).text(), 'Check for clone' );