]> source.dussan.org Git - jquery.git/commitdiff
Merge in data_nocollide branch. Fixes #6968, improves unit testing framework checks...
authorColin Snover <github.com@zetafleet.com>
Mon, 17 Jan 2011 21:31:43 +0000 (15:31 -0600)
committerColin Snover <github.com@zetafleet.com>
Mon, 17 Jan 2011 21:31:43 +0000 (15:31 -0600)
1  2 
src/event.js
src/manipulation.js
test/unit/ajax.js
test/unit/core.js
test/unit/css.js
test/unit/event.js
test/unit/manipulation.js

diff --cc src/event.js
Simple merge
Simple merge
Simple merge
index 88f7609f2ab92dc21dfc627bcde4f0eab580d34c,6231b1d53d26797d066d085eb61a8d5a9b69acfa..8e57edf9502f1410362e7d47f771ecae17edaad8
@@@ -85,10 -85,8 +85,16 @@@ test("jQuery()", function() 
        exec = true;
        elem.click();
  
+       // manually clean up detached elements
+       elem.remove();
++
 +      for ( var i = 0; i < 3; ++i ) {
 +              elem = jQuery("<input type='text' value='TEST' />");
 +      }
 +      equals( elem[0].defaultValue, "TEST", "Ensure cached nodes are cloned properly (Bug #6655)" );
++
++      // manually clean up detached elements
++      elem.remove();
  });
  
  test("selector state", function() {
Simple merge
Simple merge
Simple merge