X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fselector%2Fselector.js;h=9f982a85cf7a95f4e0c3905a4ef91eb17bbf5cb9;hb=c39d1a21c61982baf511f6455047f7f055b228da;hp=8cff87fddc15311a5f5c6e64ebab69dcc7458825;hpb=e50a2f6ca3a03501510228f940f48a0faa12127d;p=jquery.git diff --git a/src/selector/selector.js b/src/selector/selector.js index 8cff87f..9f982a8 100644 --- a/src/selector/selector.js +++ b/src/selector/selector.js @@ -45,7 +45,7 @@ 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.toUpperCase()=="BUTTON"', input: "/input|select|textarea|button/i.test(a.nodeName)" }, ".": "jQuery.className.has(a,m[2])", @@ -153,10 +153,11 @@ jQuery.extend({ if ( m ) { // Perform our own iteration and filter - for ( var i = 0, rl = ret.length; i < rl; i++ ) - for ( var c = ret[i].firstChild; c; c = c.nextSibling ) - if ( c.nodeType == 1 && ( c.nodeName == m[1].toUpperCase() || m[1] == "*" ) ) + jQuery.each( ret, function(){ + for ( var c = this.firstChild; c; c = c.nextSibling ) + if ( c.nodeType == 1 && ( c.nodeName.toUpperCase() == m[1].toUpperCase() || m[1] == "*" ) ) r.push( c ); + }); ret = r; t = jQuery.trim( t.replace( re, "" ) ); @@ -225,7 +226,7 @@ jQuery.extend({ // Do a quick check for node name (where applicable) so // that div#foo searches will be really fast ret = r = oid && - (!m[3] || oid.nodeName == m[3].toUpperCase()) ? [oid] : []; + (!m[3] || oid.nodeName.toUpperCase() == m[3].toUpperCase()) ? [oid] : []; } else { // Pre-compile a regular expression to handle class searches @@ -235,20 +236,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++ ) { + jQuery.each( ret, function(){ // 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 == "*" ) + if ( this.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( tag ) + jQuery.getAll( this, [], m[1], m[2], rec ) : + this.getElementsByTagName( tag ) ); - } + }); // It's faster to filter by class and be done with it if ( m[1] == "." && ret.length == 1 ) @@ -263,11 +264,12 @@ jQuery.extend({ r = []; // Then try to find the element with the ID - for ( var i = 0, tl = tmp.length; i < tl; i++ ) - if ( tmp[i].getAttribute("id") == m[2] ) { - r = [ tmp[i] ]; - break; + jQuery.each( tmp, function(){ + if ( this.getAttribute("id") == m[2] ) { + r = [ this ]; + return false; } + }); } ret = r; @@ -300,14 +302,13 @@ jQuery.extend({ // Look for common filter expressions while ( t && /^[a-z[({<*:.#]/i.test(t) ) { - var p = jQuery.parse; + var p = jQuery.parse, m; - for ( var i = 0, pl = p.length; i < pl; i++ ) { + jQuery.each( p, function(i,re){ // Look for, and replace, string-like sequences // and finally build a regexp out of it - var re = p[i]; - var m = re.exec( t ); + m = re.exec( t ); if ( m ) { // Remove what we just matched @@ -317,9 +318,9 @@ jQuery.extend({ if ( jQuery.expr[ m[1] ]._resort ) m = jQuery.expr[ m[1] ]._resort( m ); - break; + return false; } - } + }); // :not() is a special case that can be optimized by // keeping it out of the expression list