Commit 420dcc58 authored by Timmy Willison's avatar Timmy Willison

Update Sizzle: allows disconnected sorting. Change add to always sort with...

Update Sizzle: allows disconnected sorting. Change add to always sort with added nodes, even when disconnected.
parent ce5784a4
Subproject commit 3ed4e970e262230c799eaf24cc6d889828a3d6f3 Subproject commit f690144148d95adc867fa2a7e25be0e05eb2ecc7
...@@ -132,9 +132,7 @@ jQuery.fn.extend({ ...@@ -132,9 +132,7 @@ jQuery.fn.extend({
jQuery.makeArray( selector && selector.nodeType ? [ selector ] : selector ), jQuery.makeArray( selector && selector.nodeType ? [ selector ] : selector ),
all = jQuery.merge( this.get(), set ); all = jQuery.merge( this.get(), set );
return this.pushStack( isDisconnected( set[0] ) || isDisconnected( all[0] ) ? return this.pushStack( jQuery.unique(all) );
all :
jQuery.unique( all ) );
}, },
addBack: function( selector ) { addBack: function( selector ) {
......
...@@ -582,7 +582,7 @@ test("contents()", function() { ...@@ -582,7 +582,7 @@ test("contents()", function() {
}); });
test("add(String|Element|Array|undefined)", function() { test("add(String|Element|Array|undefined)", function() {
expect(16); expect( 15 );
deepEqual( jQuery("#sndp").add("#en").add("#sap").get(), q("sndp", "en", "sap"), "Check elements from document" ); deepEqual( jQuery("#sndp").add("#en").add("#sap").get(), q("sndp", "en", "sap"), "Check elements from document" );
deepEqual( jQuery("#sndp").add( jQuery("#en")[0] ).add( jQuery("#sap") ).get(), q("sndp", "en", "sap"), "Check elements from document" ); deepEqual( jQuery("#sndp").add( jQuery("#en")[0] ).add( jQuery("#sap") ).get(), q("sndp", "en", "sap"), "Check elements from document" );
...@@ -597,13 +597,10 @@ test("add(String|Element|Array|undefined)", function() { ...@@ -597,13 +597,10 @@ test("add(String|Element|Array|undefined)", function() {
//equal( jQuery([]).add(jQuery("#form")[0].elements).length, jQuery(jQuery("#form")[0].elements).length, "Array in constructor must equals array in add()" ); //equal( jQuery([]).add(jQuery("#form")[0].elements).length, jQuery(jQuery("#form")[0].elements).length, "Array in constructor must equals array in add()" );
var divs = jQuery("<div/>").add("#sndp"); var divs = jQuery("<div/>").add("#sndp");
ok( !divs[0].parentNode, "Make sure the first element is still the disconnected node." ); ok( divs[0].parentNode, "Sort with the disconnected node last (started with disconnected first)." );
divs = jQuery("<div>test</div>").add("#sndp");
equal( divs[0].parentNode.nodeType, 11, "Make sure the first element is still the disconnected node." );
divs = jQuery("#sndp").add("<div/>"); divs = jQuery("#sndp").add("<div/>");
ok( !divs[1].parentNode, "Make sure the first element is still the disconnected node." ); ok( !divs[1].parentNode, "Sort with the disconnected node last." );
var tmp = jQuery("<div/>"); var tmp = jQuery("<div/>");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment