From 420dcc58423dcfd3848fb62586da184b914cff22 Mon Sep 17 00:00:00 2001 From: Timmy Willison Date: Tue, 16 Oct 2012 11:52:48 -0400 Subject: [PATCH] Update Sizzle: allows disconnected sorting. Change add to always sort with added nodes, even when disconnected. --- src/sizzle | 2 +- src/traversing.js | 4 +--- test/unit/traversing.js | 9 +++------ 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/sizzle b/src/sizzle index 3ed4e970e..f69014414 160000 --- a/src/sizzle +++ b/src/sizzle @@ -1 +1 @@ -Subproject commit 3ed4e970e262230c799eaf24cc6d889828a3d6f3 +Subproject commit f690144148d95adc867fa2a7e25be0e05eb2ecc7 diff --git a/src/traversing.js b/src/traversing.js index d92bec4cb..365bb2947 100644 --- a/src/traversing.js +++ b/src/traversing.js @@ -132,9 +132,7 @@ jQuery.fn.extend({ jQuery.makeArray( selector && selector.nodeType ? [ selector ] : selector ), all = jQuery.merge( this.get(), set ); - return this.pushStack( isDisconnected( set[0] ) || isDisconnected( all[0] ) ? - all : - jQuery.unique( all ) ); + return this.pushStack( jQuery.unique(all) ); }, addBack: function( selector ) { diff --git a/test/unit/traversing.js b/test/unit/traversing.js index b93bede29..96b044977 100644 --- a/test/unit/traversing.js +++ b/test/unit/traversing.js @@ -582,7 +582,7 @@ test("contents()", 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( 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() { //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("
").add("#sndp"); - ok( !divs[0].parentNode, "Make sure the first element is still the disconnected node." ); - - divs = jQuery("
test
").add("#sndp"); - equal( divs[0].parentNode.nodeType, 11, "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("#sndp").add("
"); - 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("
");