git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Fixed IE ID selectors selecting by the name attribute and added tests
[jquery.git]
/
src
/
selector
/
selector.js
diff --git
a/src/selector/selector.js
b/src/selector/selector.js
index
8cff87f
..
e1abbf4
100644
(file)
--- a/
src/selector/selector.js
+++ b/
src/selector/selector.js
@@
-1,6
+1,6
@@
jQuery.extend({
expr: {
jQuery.extend({
expr: {
- "": "m[2]=='*'||a.nodeName.toUpperCase()==m[2].toUpperCase()",
+ "": "m[2]=='*'||jQuery.nodeName(a,m[2])",
"#": "a.getAttribute('id')==m[2]",
":": {
// Position Checks
"#": "a.getAttribute('id')==m[2]",
":": {
// Position Checks
@@
-45,7
+45,7
@@
jQuery.extend({
submit: "a.type=='submit'",
image: "a.type=='image'",
reset: "a.type=='reset'",
submit: "a.type=='submit'",
image: "a.type=='image'",
reset: "a.type=='reset'",
- button: 'a.type=="button"||a.nodeName=="BUTTON"',
+ button: 'a.type=="button"||jQuery.nodeName(a,"button")',
input: "/input|select|textarea|button/i.test(a.nodeName)"
},
".": "jQuery.className.has(a,m[2])",
input: "/input|select|textarea|button/i.test(a.nodeName)"
},
".": "jQuery.className.has(a,m[2])",
@@
-59,7
+59,7
@@
jQuery.extend({
_resort: function(m){
return ["", m[1], m[3], m[2], m[5]];
},
_resort: function(m){
return ["", m[1], m[3], m[2], m[5]];
},
- _prefix: "z=a[m[3]]||jQuery.attr(a,m[3]);"
+ _prefix: "z=a[m[3]];if(!z||/href|src/.test(m[3]))z=jQuery.attr(a,m[3]);"
},
"[": "jQuery.find(m[2],a).length"
},
},
"[": "jQuery.find(m[2],a).length"
},
@@
-85,7
+85,7
@@
jQuery.extend({
/^(\+)/, "jQuery.nth(a,2,'nextSibling')",
/^(~)/, function(a){
var s = jQuery.sibling(a.parentNode.firstChild);
/^(\+)/, "jQuery.nth(a,2,'nextSibling')",
/^(~)/, function(a){
var s = jQuery.sibling(a.parentNode.firstChild);
- return s.slice(0, jQuery.inArray(a,s));
+ return s.slice(jQuery.inArray(a,s) + 1);
}
],
}
],
@@
-153,13
+153,15
@@
jQuery.extend({
if ( m ) {
// Perform our own iteration and filter
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 && ( jQuery.nodeName(c, m[1]) || m[1] == "*" ) )
r.push( c );
r.push( c );
+ });
ret = r;
ret = r;
- t = jQuery.trim( t.replace( re, "" ) );
+ t = t.replace( re, "" );
+ if ( t.indexOf(" ") == 0 ) continue;
foundToken = true;
} else {
// Look for pre-defined expression tokens
foundToken = true;
} else {
// Look for pre-defined expression tokens
@@
-221,11
+223,15
@@
jQuery.extend({
if ( m[1] == "#" && ret[ret.length-1].getElementById ) {
// Optimization for HTML document case
var oid = ret[ret.length-1].getElementById(m[2]);
if ( m[1] == "#" && ret[ret.length-1].getElementById ) {
// Optimization for HTML document case
var oid = ret[ret.length-1].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] )
+ oid = jQuery('[@id="'+m[2]+'"]', ret[ret.length-1])[0];
// Do a quick check for node name (where applicable) so
// that div#foo searches will be really fast
// 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] : [];
+ ret = r = oid && (!m[3] || jQuery.nodeName(oid, m[3])) ? [oid] : [];
} else {
// Pre-compile a regular expression to handle class searches
} else {
// Pre-compile a regular expression to handle class searches
@@
-235,20
+241,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
// 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 <object>s
// Grab the tag name being searched for
var tag = m[1] != "" || m[0] == "" ? "*" : m[2];
// Handle IE7 being really dumb about <object>s
- if ( ret[i].nodeName.toUpperCase() == "OBJECT" && tag == "*" )
+ if ( jQuery.nodeName(this, "object") && tag == "*" )
tag = "param";
jQuery.merge( r,
m[1] != "" && ret.length != 1 ?
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 )
// It's faster to filter by class and be done with it
if ( m[1] == "." && ret.length == 1 )
@@
-263,11
+269,12
@@
jQuery.extend({
r = [];
// Then try to find the element with the ID
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;
}
ret = r;
@@
-300,14
+307,13
@@
jQuery.extend({
// Look for common filter expressions
while ( t && /^[a-z[({<*:.#]/i.test(t) ) {
// 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
// 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
if ( m ) {
// Remove what we just matched
@@
-317,9
+323,9
@@
jQuery.extend({
if ( jQuery.expr[ m[1] ]._resort )
m = jQuery.expr[ m[1] ]._resort( m );
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
// :not() is a special case that can be optimized by
// keeping it out of the expression list