X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fselector%2Fselector.js;h=1f451c9c8c1bd0520cc714e4f363cbc063f9deba;hb=e1e631a04440c0d9ab6580ea1593286072fa7ef5;hp=e21102c8dd76eb36d774a083a97a8e2a0f2fd995;hpb=aa424984f7c37956f568512aa94bc16787e4c651;p=jquery.git diff --git a/src/selector/selector.js b/src/selector/selector.js index e21102c..1f451c9 100644 --- a/src/selector/selector.js +++ b/src/selector/selector.js @@ -1,6 +1,6 @@ jQuery.extend({ expr: { - "": "m[2]== '*'||a.nodeName.toUpperCase()==m[2].toUpperCase()", + "": "m[2]=='*'||a.nodeName.toUpperCase()==m[2].toUpperCase()", "#": "a.getAttribute('id')==m[2]", ":": { // Position Checks @@ -27,14 +27,14 @@ jQuery.extend({ contains: "jQuery.fn.text.apply([a]).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: '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"', // Form attributes enabled: "!a.disabled", disabled: "a.disabled", checked: "a.checked", - selected: "a.selected || jQuery.attr(a, 'selected')", + selected: "a.selected||jQuery.attr(a,'selected')", // Form elements text: "a.type=='text'", @@ -45,16 +45,16 @@ jQuery.extend({ submit: "a.type=='submit'", image: "a.type=='image'", reset: "a.type=='reset'", - button: "a.type=='button'||a.nodeName=='BUTTON'", + button: 'a.type=="button"||a.nodeName=="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&&!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]]; @@ -67,28 +67,41 @@ jQuery.extend({ // The regular expressions that power the parsing engine parse: [ // Match: [@value='test'], [@foo] - "\\[ *(@)S *([!*$^=]*) *('?\"?)(.*?)\\4 *\\]", + /^\[ *(@)([a-z0-9_-]*) *([!*$^=]*) *('?"?)(.*?)\4 *\]/i, // Match: [div], [div p] - "(\\[)\\s*(.*?(\\[.*?\\])?[^[]*?)\\s*\\]", + /^(\[)\s*(.*?(\[.*?\])?[^[]*?)\s*\]/, // Match: :contains('foo') - "(:)S\\(\"?'?(.*?(\\(.*?\\))?[^(]*?)\"?'?\\)", + /^(:)([a-z0-9_-]*)\("?'?(.*?(\(.*?\))?[^(]*?)"?'?\)/i, // Match: :even, :last-chlid - "([:.#]*)S" + /^([:.#]*)([a-z0-9_-]*)/i ], token: [ - "\\.\\.|/\\.\\.", "a.parentNode", - ">|/", "jQuery.sibling(a.firstChild)", - "\\+", "jQuery.nth(a,2,'nextSibling')", - "~", function(a){ + /^(\/?\.\.)/, "a.parentNode", + /^(>|\/)/, "jQuery.sibling(a.firstChild)", + /^(\+)/, "jQuery.nth(a,2,'nextSibling')", + /^(~)/, function(a){ var s = jQuery.sibling(a.parentNode.firstChild); return s.slice(0, jQuery.inArray(a,s)); } ], + multiFilter: function( expr, elems, not ) { + var old, cur = []; + + while ( expr && expr != old ) { + old = expr; + var f = jQuery.filter( expr, elems, not ); + expr = f.t.replace(/^\s*,\s*/, "" ); + cur = not ? elems = f.r : jQuery.merge( cur, f.r ); + } + + return cur; + }, + /** * @name $.find * @type Array @@ -153,13 +166,13 @@ jQuery.extend({ for ( var i = 0; i < jQuery.token.length; i += 2 ) { // Attempt to match each, individual, token in // the specified order - var re = new RegExp("^(" + jQuery.token[i] + ")"); + 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.token[i+1].constructor == Function ? + r = ret = jQuery.map( ret, jQuery.isFunction( jQuery.token[i+1] ) ? jQuery.token[i+1] : function(a){ return eval(jQuery.token[i+1]); }); @@ -175,8 +188,8 @@ jQuery.extend({ // matched a token if ( t && !foundToken ) { // Handle multiple expressions - if ( !t.indexOf(",") || !t.indexOf("|") ) { - // Clean teh result set + if ( !t.indexOf(",") ) { + // Clean the result set if ( ret[0] == context ) ret.shift(); // Merge the result sets @@ -222,12 +235,20 @@ jQuery.extend({ // 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++ ) + for ( var i = 0, rl = ret.length; i < rl; i++ ) { + // Grab the tag name being searched for + var tag = m[1] != "" || m[0] == "" ? "*" : m[2]; + + // Handle IE7 being really dumb about s + if ( ret[i].nodeName.toUpperCase() == "OBJECT" && tag == "*" ) + tag = "param"; + jQuery.merge( r, m[1] != "" && ret.length != 1 ? jQuery.getAll( ret[i], [], m[1], m[2], rec ) : - ret[i].getElementsByTagName( m[1] != "" || m[0] == "" ? "*" : m[2] ) + ret[i].getElementsByTagName( tag ) ); + } // It's faster to filter by class and be done with it if ( m[1] == "." && ret.length == 1 ) @@ -285,19 +306,17 @@ jQuery.extend({ // Look for, and replace, string-like sequences // and finally build a regexp out of it - var re = new RegExp( - "^" + p[i].replace("S", "([a-z*_-][a-z0-9_-]*)"), "i" ); - + var re = p[i]; var m = re.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 ); - // Remove what we just matched - t = t.replace( re, "" ); - break; } } @@ -313,7 +332,7 @@ jQuery.extend({ var re = new RegExp("(^|\\s)" + m[2] + "(\\s|$)"); r = jQuery.grep( r, function(e){ - return re.test(e.className || ''); + return re.test(e.className || ""); }, not); // Otherwise, find the expression to execute @@ -345,7 +364,7 @@ jQuery.extend({ if ( token == "." ) add = s.className && re.test(s.className); else if ( token == "#" ) - add = s.getAttribute('id') == name; + add = s.getAttribute("id") == name; if ( add ) r.push( s );