Added Yehuda's selector engine improvements (it's now trivial to add in your own...

diff --git a/src/jquery/coreTest.js b/src/jquery/coreTest.js
index 31fe838..ada7195 100644 (file)
--- a/src/jquery/coreTest.js
+++ b/src/jquery/coreTest.js
@@ -396,7 +396,7 @@ test("expressions - attributes", function() {
        t( "Attribute Ends With", "a[@href $= 'org/']", ["mark"] );\r
        t( "Attribute Contains", "a[@href *= 'google']", ["google","groups"] );\r
        \r
-       t("Select options via [@selected]", "#select1 option[@selected]", [] );\r
+       t("Select options via [@selected]", "#select1 option[@selected]", ["option1a"] );\r
        t("Select options via [@selected]", "#select2 option[@selected]", ["option2d"] );\r
        t("Select options via [@selected]", "#select3 option[@selected]", ["option3b", "option3c"] );\r
        \r

diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index 3d2bf48..d22d136 100644 (file)
--- a/src/jquery/jquery.js
+++ b/src/jquery/jquery.js
@@ -1473,20 +1473,24 @@ jQuery.extend({
                        "^=": "z && !z.indexOf(m[4])",
                        "$=": "z && z.substr(z.length - m[4].length,m[4].length)==m[4]",
                        "*=": "z && z.indexOf(m[4])>=0",
-                       "": "z"
+                       "": "z",
+                       _resort: function(m){
+                               return ["", m[1], m[3], m[2], m[5]];
+                       },
+                       _prefix: "z=jQuery.attr(a,m[3]);"
                },
                "[": "jQuery.find(m[2],a).length"
        },
 
-  /**
+       /**
         * All elements on a specified axis.
         *
         * @private
         * @name $.sibling
         * @type Array
         * @param Element elem The element to find all the siblings of (including itself).
-   * @cat DOM/Traversing
-   */
+        * @cat DOM/Traversing
+        */
        sibling: function( n, elem ) {
                var r = [];
 
@@ -1806,8 +1810,8 @@ jQuery.extend({
 
                                if ( m ) {
                                        // Re-organize the first match
-                                       if ( !i )
-                                               m = ["",m[1], m[3], m[2], m[5]];
+                                       if ( jQuery.expr[ m[1] ]._resort )
+                                               m = jQuery.expr[ m[1] ]._resort( m );
 
                                        // Remove what we just matched
                                        t = t.replace( re, "" );
@@ -1838,7 +1842,7 @@ jQuery.extend({
 
                                // Build a custom macro to enclose it
                                eval("f = function(a,i){" +
-                                       ( m[1] == "@" ? "z=jQuery.attr(a,m[3]);" : "" ) +
+                                       ( jQuery.expr[ m[1] ]._prefix || "" ) +
                                        "return " + f + "}");
 
                                // Execute it against the current filter