]> source.dussan.org Git - jquery.git/commitdiff
Merge branch 'bug5566' into csnover-bug5566. Fixes #4386, #5566, #6997.
authorColin Snover <github.com@zetafleet.com>
Sun, 12 Dec 2010 08:39:06 +0000 (02:39 -0600)
committerColin Snover <github.com@zetafleet.com>
Sun, 12 Dec 2010 08:39:06 +0000 (02:39 -0600)
Conflicts:
src/manipulation.js
test/unit/manipulation.js

1  2 
src/manipulation.js
test/unit/manipulation.js

Simple merge
index 48050168435aa1cc842024a6ac04b5a4cd60cc94,71a501ac52c6578b47bb10b5893e85af80e20aa1..29c79a2d6aa997214ce0919326836e37dc69be6f
@@@ -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' );