Fix a regression where has with multiple contexts was not filtering correctly. Test...

diff --git a/src/traversing.js b/src/traversing.js
index 8685ae017f767a0e1ccd53e83664012880a117e9..4c58ae0b83a22d9ea7b8dae55d555a07e27250ba 100644 (file)
--- a/src/traversing.js
+++ b/src/traversing.js
@@ -48,12 +48,12 @@ jQuery.fn.extend({
        },
 
        has: function( target ) {
-               var i = 0,
+               var i,
                        targets = jQuery( target, this ),
-                       l = targets.length;
+                       len = targets.length;
 
                return this.filter(function() {
-                       for ( ; i < l; i++ ) {
+                       for ( i = 0; i < len; i++ ) {
                                if ( jQuery.contains( this, targets[i] ) ) {
                                        return true;
                                }

diff --git a/test/unit/traversing.js b/test/unit/traversing.js
index 7f9678307c655d97b9be8212f96c4320ad0af415..e7d5196628f67319b57ac262bdf04d1f79957a9b 100644 (file)
--- a/test/unit/traversing.js
+++ b/test/unit/traversing.js
@@ -376,7 +376,7 @@ test("has(Element)", function() {
 });
 
 test("has(Selector)", function() {
-       expect(4);
+       expect( 5 );
 
        var obj = jQuery("#qunit-fixture").has("#sndp");
        deepEqual( obj.get(), q("qunit-fixture"), "Keeps elements that have any element matching the selector as a descendant" );
@@ -385,7 +385,10 @@ test("has(Selector)", function() {
        deepEqual( detached.has("i").get(), detached.get(), "...Even when detached" );
 
        var multipleParent = jQuery("#qunit-fixture, #header").has("#sndp");
-       deepEqual( obj.get(), q("qunit-fixture"), "Does not include elements that do not have the element as a descendant" );
+       deepEqual( multipleParent.get(), q("qunit-fixture"), "Does not include elements that do not have the element as a descendant" );
+
+       multipleParent = jQuery("#select1, #select2, #select3").has("#option1a, #option3a");
+       deepEqual( multipleParent.get(), q("select1", "select3"), "Multiple contexts are checks correctly" );
 
        var multipleHas = jQuery("#qunit-fixture").has("#sndp, #first");
        deepEqual( multipleHas.get(), q("qunit-fixture"), "Only adds elements once" );