Added support for a new :header psuedo-selector (only selects H1-H6 elements).
[jquery.git] / src / selector / selector.js
index 9d36ca7..f75bae3 100644 (file)
@@ -1,3 +1,11 @@
+
+var chars = jQuery.browser.safari && parseInt(jQuery.browser.version) < 417 ?
+               "(?:[\\w*_-]|\\\\.)" :
+               "(?:[\\w\u0128-\uFFFF*_-]|\\\\.)",
+       quickChild = new RegExp("^[/>]\\s*(" + chars + "+)"),
+       quickID = new RegExp("^(" + chars + "+)(#)(" + chars + "+)"),
+       quickClass = new RegExp("^([#.]?)(" + chars + "*)");
+
 jQuery.extend({
        expr: {
                "": "m[2]=='*'||jQuery.nodeName(a,m[2])",
@@ -14,21 +22,20 @@ jQuery.extend({
                        odd: "i%2",
 
                        // Child Checks
-                       "nth-child": "jQuery.nth(a.parentNode.firstChild,m[3],'nextSibling',a)==a",
-                       "first-child": "jQuery.nth(a.parentNode.firstChild,1,'nextSibling')==a",
+                       "first-child": "a.parentNode.getElementsByTagName('*')[0]==a",
                        "last-child": "jQuery.nth(a.parentNode.lastChild,1,'previousSibling')==a",
-                       "only-child": "jQuery.sibling(a.parentNode.firstChild).length==1",
+                       "only-child": "!jQuery.nth(a.parentNode.lastChild,2,'previousSibling')",
 
                        // Parent Checks
                        parent: "a.firstChild",
                        empty: "!a.firstChild",
 
                        // Text Check
-                       contains: "jQuery.fn.text.apply([a]).indexOf(m[3])>=0",
+                       contains: "(a.textContent||a.innerText||'').indexOf(m[3])>=0",
 
                        // Visibility
-                       visible: 'a.type!="hidden"&&jQuery.css(a,"display")!="none"&&jQuery.css(a,"visibility")!="hidden"',
-                       hidden: 'a.type=="hidden"||jQuery.css(a,"display")=="none"||jQuery.css(a,"visibility")=="hidden"',
+                       visible: '"hidden"!=a.type&&jQuery.css(a,"display")!="none"&&jQuery.css(a,"visibility")!="hidden"',
+                       hidden: '"hidden"==a.type||jQuery.css(a,"display")=="none"||jQuery.css(a,"visibility")=="hidden"',
 
                        // Form attributes
                        enabled: "!a.disabled",
@@ -37,56 +44,41 @@ jQuery.extend({
                        selected: "a.selected||jQuery.attr(a,'selected')",
 
                        // Form elements
-                       text: "a.type=='text'",
-                       radio: "a.type=='radio'",
-                       checkbox: "a.type=='checkbox'",
-                       file: "a.type=='file'",
-                       password: "a.type=='password'",
-                       submit: "a.type=='submit'",
-                       image: "a.type=='image'",
-                       reset: "a.type=='reset'",
-                       button: 'a.type=="button"||jQuery.nodeName(a,"button")',
-                       input: "/input|select|textarea|button/i.test(a.nodeName)"
-               },
-               ".": "jQuery.className.has(a,m[2])",
-               "@": {
-                       "=": "z==m[4]",
-                       "!=": "z!=m[4]",
-                       "^=": "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",
-                       _resort: function(m){
-                               return ["", m[1], m[3], m[2], m[5]];
-                       },
-                       _prefix: "z=a[m[3]];if(!z||/href|src/.test(m[3]))z=jQuery.attr(a,m[3]);"
+                       text: "'text'==a.type",
+                       radio: "'radio'==a.type",
+                       checkbox: "'checkbox'==a.type",
+                       file: "'file'==a.type",
+                       password: "'password'==a.type",
+                       submit: "'submit'==a.type",
+                       image: "'image'==a.type",
+                       reset: "'reset'==a.type",
+                       button: '"button"==a.type||jQuery.nodeName(a,"button")',
+                       input: "/input|select|textarea|button/i.test(a.nodeName)",
+
+                       // :has()
+                       has: "jQuery.find(m[3],a).length",
+
+                       // :header
+                       header: "/h\\d/i.test(a.nodeName)"
                },
+               // DEPRECATED
                "[": "jQuery.find(m[2],a).length"
        },
        
        // The regular expressions that power the parsing engine
        parse: [
                // Match: [@value='test'], [@foo]
-               /^\[ *(@)([\w-]+) *([!*$^=]*) *('?"?)(.*?)\4 *\]/i,
+               /^\[ *(@)([\w-]+) *([!*$^~=]*) *('?"?)(.*?)\4 *\]/,
 
+               // DEPRECATED
                // Match: [div], [div p]
                /^(\[)\s*(.*?(\[.*?\])?[^[]*?)\s*\]/,
 
                // Match: :contains('foo')
-               /^(:)([\w-]+)\("?'?(.*?(\(.*?\))?[^(]*?)"?'?\)/i,
+               /^(:)([\w-]+)\("?'?(.*?(\(.*?\))?[^(]*?)"?'?\)/,
 
                // Match: :even, :last-chlid, #id, .class
-               /^([:.#]*)([\w\u0128-\uFFFF*-]+)/i
-       ],
-
-       token: [
-               /^(\/?\.\.)/, "a.parentNode",
-               /^(>|\/)/, "jQuery.sibling(a.firstChild)",
-               /^(\+)/, "jQuery.nth(a,2,'nextSibling')",
-               /^(~)/, function(a){
-                       var s = jQuery.sibling(a.parentNode.firstChild);
-                       return s.slice(jQuery.inArray(a,s) + 1);
-               }
+               new RegExp("^([:.#]*)(" + chars + "+)")
        ],
 
        multiFilter: function( expr, elems, not ) {
@@ -120,11 +112,13 @@ jQuery.extend({
                // Set the correct context (if none is provided)
                context = context || document;
 
+               // DEPRECATED
                // Handle the common XPath // expression
                if ( !t.indexOf("//") ) {
-                       context = context.documentElement;
+                       //context = context.documentElement;
                        t = t.substr(2,t.length);
 
+               // DEPRECATED
                // And the / root expression
                } else if ( !t.indexOf("/") && !context.ownerDocument ) {
                        context = context.documentElement;
@@ -142,47 +136,62 @@ jQuery.extend({
                        var r = [];
                        last = t;
 
+                       // DEPRECATED
                        t = jQuery.trim(t).replace( /^\/\//, "" );
 
                        var foundToken = false;
 
                        // An attempt at speeding up child selectors that
                        // point to a specific element tag
-                       var re = /^[\/>]\s*([\w*-]+)/i;
+                       var re = quickChild;
                        var m = re.exec(t);
 
                        if ( m ) {
+                               var nodeName = m[1].toUpperCase();
+
                                // Perform our own iteration and filter
-                               jQuery.each( ret, function(){
-                                       for ( var c = this.firstChild; c; c = c.nextSibling )
-                                               if ( c.nodeType == 1 && ( jQuery.nodeName(c, m[1]) || m[1] == "*" ) )
+                               for ( var i = 0; ret[i]; i++ )
+                                       for ( var c = ret[i].firstChild; c; c = c.nextSibling )
+                                               if ( c.nodeType == 1 && (nodeName == "*" || c.nodeName.toUpperCase() == nodeName.toUpperCase()) )
                                                        r.push( c );
-                               });
 
                                ret = r;
                                t = t.replace( re, "" );
                                if ( t.indexOf(" ") == 0 ) continue;
                                foundToken = true;
                        } else {
-                               // Look for pre-defined expression tokens
-                               for ( var i = 0; i < jQuery.token.length; i += 2 ) {
-                                       // Attempt to match each, individual, token in
-                                       // the specified order
-                                       var re = jQuery.token[i];
-                                       var m = re.exec(t);
-
-                                       // If the token match was found
-                                       if ( m ) {
-                                               // Map it against the token's handler
-                                               r = ret = jQuery.map( ret, jQuery.isFunction( jQuery.token[i+1] ) ?
-                                                       jQuery.token[i+1] :
-                                                       function(a){ return eval(jQuery.token[i+1]); });
-
-                                               // And remove the token
-                                               t = jQuery.trim( t.replace( re, "" ) );
-                                               foundToken = true;
-                                               break;
-                                       }
+                               // (.. and /) DEPRECATED
+                               re = /^((\/?\.\.)|([>\/+~]))\s*(\w*)/i;
+
+                               if ( (m = re.exec(t)) != null ) {
+                                       r = [];
+
+                                       var nodeName = m[4], mergeNum = jQuery.mergeNum++;
+                                       m = m[1];
+
+                                       for ( var j = 0, rl = ret.length; j < rl; j++ )
+                                               if ( m.indexOf("..") < 0 ) {
+                                                       var n = m == "~" || m == "+" ? ret[j].nextSibling : ret[j].firstChild;
+                                                       for ( ; n; n = n.nextSibling )
+                                                               if ( n.nodeType == 1 ) {
+                                                                       if ( m == "~" && n.mergeNum == mergeNum ) break;
+                                                                       
+                                                                       if (!nodeName || n.nodeName.toUpperCase() == nodeName.toUpperCase() ) {
+                                                                               if ( m == "~" ) n.mergeNum = mergeNum;
+                                                                               r.push( n );
+                                                                       }
+                                                                       
+                                                                       if ( m == "+" ) break;
+                                                               }
+                                               // DEPRECATED
+                                               } else
+                                                       r.push( ret[j].parentNode );
+
+                                       ret = r;
+
+                                       // And remove the token
+                                       t = jQuery.trim( t.replace( re, "" ) );
+                                       foundToken = true;
                                }
                        }
 
@@ -192,7 +201,7 @@ jQuery.extend({
                                // Handle multiple expressions
                                if ( !t.indexOf(",") ) {
                                        // Clean the result set
-                                       if ( ret[0] == context ) ret.shift();
+                                       if ( context == ret[0] ) ret.shift();
 
                                        // Merge the result sets
                                        done = jQuery.merge( done, ret );
@@ -204,8 +213,8 @@ jQuery.extend({
                                        t = " " + t.substr(1,t.length);
 
                                } else {
-                                       // Optomize for the case nodeName#idName
-                                       var re2 = /^(\w+)(#)([\w\u0128-\uFFFF*-]+)/i;
+                                       // Optimize for the case nodeName#idName
+                                       var re2 = quickID;
                                        var m = re2.exec(t);
                                        
                                        // Re-organize the results, so that they're consistent
@@ -215,37 +224,33 @@ jQuery.extend({
                                        } else {
                                                // Otherwise, do a traditional filter check for
                                                // ID, class, and element selectors
-                                               re2 = /^([#.]?)([\w\u0128-\uFFFF*-]*)/i;
+                                               re2 = quickClass;
                                                m = re2.exec(t);
                                        }
 
+                                       m[2] = m[2].replace(/\\/g, "");
+
                                        var elem = ret[ret.length-1];
 
                                        // Try to do a global search by ID, where we can
-                                       if ( m[1] == "#" && elem && elem.getElementById ) {
+                                       if ( m[1] == "#" && elem && elem.getElementById && !jQuery.isXMLDoc(elem) ) {
                                                // Optimization for HTML document case
                                                var oid = elem.getElementById(m[2]);
                                                
                                                // Do a quick check for the existence of the actual ID attribute
                                                // to avoid selecting by the name attribute in IE
-                                               if ( jQuery.browser.msie && oid && oid.id != m[2] )
+                                               // also check to insure id is a string to avoid selecting an element with the name of 'id' inside a form
+                                               if ( (jQuery.browser.msie||jQuery.browser.opera) && oid && typeof oid.id == "string" && oid.id != m[2] )
                                                        oid = jQuery('[@id="'+m[2]+'"]', elem)[0];
 
                                                // Do a quick check for node name (where applicable) so
                                                // that div#foo searches will be really fast
                                                ret = r = oid && (!m[3] || jQuery.nodeName(oid, m[3])) ? [oid] : [];
-
                                        } else {
-                                               // Pre-compile a regular expression to handle class searches
-                                               if ( m[1] == "." )
-                                                       var rec = new RegExp("(^|\\s)" + m[2] + "(\\s|$)");
-
-                                               // We need to find all descendant elements, it is more
-                                               // efficient to use getAll() when we are already further down
-                                               // the tree - we try to recognize that here
-                                               for ( var i = 0, rl = ret.length; i < rl; i++ ) {
+                                               // We need to find all descendant elements
+                                               for ( var i = 0; ret[i]; i++ ) {
                                                        // Grab the tag name being searched for
-                                                       var tag = m[1] != "" || m[0] == "" ? "*" : m[2];
+                                                       var tag = m[1] == "#" && m[3] ? m[3] : m[1] != "" || m[0] == "" ? "*" : m[2];
 
                                                        // Handle IE7 being really dumb about <object>s
                                                        if ( tag == "*" && ret[i].nodeName.toLowerCase() == "object" )
@@ -256,23 +261,20 @@ jQuery.extend({
 
                                                // It's faster to filter by class and be done with it
                                                if ( m[1] == "." )
-                                                       r = jQuery.grep( r, function(e) {
-                                                               return rec.test(e.className);
-                                                       });
+                                                       r = jQuery.classFilter( r, m[2] );
 
                                                // Same with ID filtering
                                                if ( m[1] == "#" ) {
-                                                       // Remember, then wipe out, the result set
-                                                       var tmp = r;
-                                                       r = [];
-
-                                                       // Then try to find the element with the ID
-                                                       jQuery.each( tmp, function(){
-                                                               if ( this.getAttribute("id") == m[2] ) {
-                                                                       r = [ this ];
-                                                                       return false;
+                                                       var tmp = [];
+
+                                                       // Try to find the element with the ID
+                                                       for ( var i = 0; r[i]; i++ )
+                                                               if ( r[i].getAttribute("id") == m[2] ) {
+                                                                       tmp = [ r[i] ];
+                                                                       break;
                                                                }
-                                                       });
+
+                                                       r = tmp;
                                                }
 
                                                ret = r;
@@ -298,7 +300,7 @@ jQuery.extend({
                        ret = [];
 
                // Remove the root context
-               if ( ret && ret[0] == context )
+               if ( ret && context == ret[0] )
                        ret.shift();
 
                // And combine the results
@@ -307,6 +309,17 @@ jQuery.extend({
                return done;
        },
 
+       classFilter: function(r,m,not){
+               m = " " + m + " ";
+               var tmp = [];
+               for ( var i = 0; r[i]; i++ ) {
+                       var pass = (" " + r[i].className + " ").indexOf( m ) >= 0;
+                       if ( !not && pass || not && !pass )
+                               tmp.push( r[i] );
+               }
+               return tmp;
+       },
+
        filter: function(t,r,not) {
                var last;
 
@@ -316,40 +329,84 @@ jQuery.extend({
 
                        var p = jQuery.parse, m;
 
-                       jQuery.each( p, function(i,re){
-               
-                               // Look for, and replace, string-like sequences
-                               // and finally build a regexp out of it
-                               m = re.exec( t );
+                       for ( var i = 0; p[i]; i++ ) {
+                               m = p[i].exec( t );
 
                                if ( m ) {
                                        // Remove what we just matched
                                        t = t.substring( m[0].length );
 
-                                       // Re-organize the first match
-                                       if ( jQuery.expr[ m[1] ]._resort )
-                                               m = jQuery.expr[ m[1] ]._resort( m );
-
-                                       return false;
+                                       m[2] = m[2].replace(/\\/g, "");
+                                       break;
                                }
-                       });
+                       }
 
                        if ( !m )
-                               continue;
+                               break;
 
                        // :not() is a special case that can be optimized by
                        // keeping it out of the expression list
                        if ( m[1] == ":" && m[2] == "not" )
                                r = jQuery.filter(m[3], r, true).r;
 
-                       // Handle classes as a special case (this will help to
-                       // improve the speed, as the regexp will only be compiled once)
-                       else if ( m[1] == "." ) {
+                       // We can get a big speed boost by filtering by class here
+                       else if ( m[1] == "." )
+                               r = jQuery.classFilter(r, m[2], not);
+
+                       else if ( m[1] == "@" ) {
+                               var tmp = [], type = m[3];
+                               
+                               for ( var i = 0, rl = r.length; i < rl; i++ ) {
+                                       var a = r[i], z = a[ jQuery.props[m[2]] || m[2] ];
+                                       
+                                       if ( z == null || /href|src|selected/.test(m[2]) )
+                                               z = jQuery.attr(a,m[2]) || '';
+
+                                       if ( (type == "" && !!z ||
+                                                type == "=" && z == m[5] ||
+                                                type == "!=" && z != m[5] ||
+                                                type == "^=" && z && !z.indexOf(m[5]) ||
+                                                type == "$=" && z.substr(z.length - m[5].length) == m[5] ||
+                                                (type == "*=" || type == "~=") && z.indexOf(m[5]) >= 0) ^ not )
+                                                       tmp.push( a );
+                               }
+                               
+                               r = tmp;
+
+                       // We can get a speed boost by handling nth-child here
+                       } else if ( m[1] == ":" && m[2] == "nth-child" ) {
+                               var num = jQuery.mergeNum++, tmp = [],
+                                       test = /(\d*)n\+?(\d*)/.exec(
+                                               m[3] == "even" && "2n" || m[3] == "odd" && "2n+1" ||
+                                               !/\D/.test(m[3]) && "n+" + m[3] || m[3]),
+                                       first = (test[1] || 1) - 0, last = test[2] - 0;
+
+                               for ( var i = 0, rl = r.length; i < rl; i++ ) {
+                                       var node = r[i], parentNode = node.parentNode;
+
+                                       if ( num != parentNode.mergeNum ) {
+                                               var c = 1;
+
+                                               for ( var n = parentNode.firstChild; n; n = n.nextSibling )
+                                                       if ( n.nodeType == 1 )
+                                                               n.nodeIndex = c++;
 
-                               var re = new RegExp("(^|\\s)" + m[2] + "(\\s|$)");
-                               r = jQuery.grep( r, function(e){
-                                       return re.test(e.className || "");
-                               }, not);
+                                               parentNode.mergeNum = num;
+                                       }
+
+                                       var add = false;
+
+                                       if ( first == 1 ) {
+                                               if ( last == 0 || node.nodeIndex == last )
+                                                       add = true;
+                                       } else if ( (node.nodeIndex + last) % first == 0 )
+                                               add = true;
+
+                                       if ( add ^ not )
+                                               tmp.push( node );
+                               }
+
+                               r = tmp;
 
                        // Otherwise, find the expression to execute
                        } else {
@@ -358,9 +415,7 @@ jQuery.extend({
                                        f = jQuery.expr[m[1]][m[2]];
 
                                // Build a custom macro to enclose it
-                               eval("f = function(a,i){" +
-                                       ( jQuery.expr[ m[1] ]._prefix || "" ) +
-                                       "return " + f + "}");
+                               f = eval("false||function(a,i){return " + f + "}");
 
                                // Execute it against the current filter
                                r = jQuery.grep( r, f, not );
@@ -406,11 +461,12 @@ jQuery.extend({
        nth: function(cur,result,dir,elem){
                result = result || 1;
                var num = 0;
-               for ( ; cur; cur = cur[dir] ) {
-                       if ( cur.nodeType == 1 ) num++;
-                       if ( num == result || result == "even" && num % 2 == 0 && num > 1 && cur == elem ||
-                               result == "odd" && num % 2 == 1 && cur == elem ) return cur;
-               }
+
+               for ( ; cur; cur = cur[dir] )
+                       if ( cur.nodeType == 1 && ++num == result )
+                               break;
+
+               return cur;
        },
        
        /**