Changeset 4143

Timestamp:

12/13/07 22:24:59 (1 year ago)

Author:

davidserduke

Message:

Fixed #1854 by using wizzud's suggestion. The only real difference is the code is only called when there is more than a single selector. So there should be no speed decrease in the current working cases. Only additional functionality for cases that used to fail.

Location:

trunk/jquery

Files:

• src/core.js (modified) (2 diffs)
• src/selector.js (modified) (1 diff)
• test/index.html (modified) (3 diffs)
• test/unit/core.js (modified) (1 diff)
• test/unit/selector.js (modified) (2 diffs)

trunk/jquery/src/core.js

@@ -343 +343 @@
 
     not: function( selector ) {
-        return this.pushStack(
-            selector.constructor == String &&
-            jQuery.multiFilter( selector, this, true ) ||
-
-            jQuery.grep(this, function(elem) {
-                return selector.constructor == Array || selector.jquery ?
-                    jQuery.inArray( elem, selector ) < 0 :
-                    elem != selector;
-            }) );
+        if (selector.constructor == String)
+            // test special case where just one selector is passed in
+            if ( /^.[^:#\[\.]*$/.test(selector) )
+                return this.pushStack( jQuery.multiFilter( selector, this, true ) );
+            else
+                selector = jQuery.multiFilter( selector, this );
+
+        return this.pushStack( jQuery.removeFromArray( selector, this ) );
     },
 
@@ -1094 +1093 @@
     },
 
+    removeFromArray: function( remove, from ) {
+        var isArrayLike = remove.length && remove[remove.length - 1] !== undefined;
+        return jQuery.grep(from, function(elem) {
+                return isArrayLike ? jQuery.inArray( elem, remove ) < 0 : elem != from;
+            });
+    },
+
     merge: function( first, second ) {
         // We have to loop this way because IE & Opera overwrite the length

trunk/jquery/src/selector.js

@@ -321 +321 @@
             // keeping it out of the expression list
             if ( m[1] == ":" && m[2] == "not" )
-                r = jQuery.filter(m[3], r, true).r;
+                // optimize if only one selector found (most common case)
+                if ( /^.[^:#\[\.]*$/.test(m[3]) )
+                    r = jQuery.filter(m[3], r, true).r;
+                else
+                    r = jQuery.removeFromArray(jQuery.multiFilter(m[3], r), r);
 
             // We can get a big speed boost by filtering by class here

trunk/jquery/test/index.html

@@ -62 +62 @@
             
             <select name="select1" id="select1">
-                <option id="option1a" value="">Nothing</option>
+                <option id="option1a" class="emptyopt" value="">Nothing</option>
                 <option id="option1b" value="1">1</option>
                 <option id="option1c" value="2">2</option>
@@ -68 +68 @@
             </select>
             <select name="select2" id="select2">
-                <option id="option2a" value="">Nothing</option>
+                <option id="option2a" class="emptyopt" value="">Nothing</option>
                 <option id="option2b" value="1">1</option>
                 <option id="option2c" value="2">2</option>
@@ -74 +74 @@
             </select>
             <select name="select3" id="select3" multiple="multiple">
-                <option id="option3a" value="">Nothing</option>
+                <option id="option3a" class="emptyopt" value="">Nothing</option>
                 <option id="option3b" selected="selected" value="1">1</option>
                 <option id="option3c" selected="selected" value="2">2</option>

trunk/jquery/test/unit/core.js

@@ -1053 +1053 @@
 
 test("not()", function() {
-    expect(3);
+    expect(5);
     ok( $("#main > p#ap > a").not("#google").length == 2, "not('selector')" );
+    isSet( $("p").not(".result").get(), q("firstp", "ap", "sndp", "en", "sap", "first"), "not('.class')" );
     isSet( $("p").not("#ap, #sndp, .result").get(), q("firstp", "en", "sap", "first"), "not('selector, selector')" );
     isSet( $("p").not($("#ap, #sndp, .result")).get(), q("firstp", "en", "sap", "first"), "not(jQuery)" );
+    isSet( $("#form option").not("option.emptyopt:contains('Nothing'),[selected],[value='1']").get(), q("option1c", "option1d", "option2c", "option3d" ), "not('complex selector')");
 });
 

trunk/jquery/test/unit/selector.js

@@ -183 +183 @@
 
 test("pseudo (:) selectors", function() {
-    expect(32);
+    expect(35);
     t( "First Child", "p:first-child", ["firstp","sndp"] );
     t( "Last Child", "p:last-child", ["sap"] );
@@ -196 +196 @@
     t( "Element Preceded By", "p ~ div", ["foo","fx-queue","fx-tests", "moretests"] );
     t( "Not", "a.blog:not(.link)", ["mark"] );
+    t( "Not - multiple", "#form option:not(:contains('Nothing'),#option1b,:selected)", ["option1c", "option1d", "option2b", "option2c", "option3d"] );
+    t( "Not - complex", "#form option:not([id^='opt']:gt(0):nth-child(-n+3))", [ "option1a", "option1d", "option2d", "option3d"] );
+    t( "Not - recursive", "#form option:not(:not(:selected))[id^='option3']", [ "option3b", "option3c"] );
     
     t( "nth Element", "p:nth(1)", ["ap"] );