_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"
},
// The regular expressions that power the parsing engine
parse: [
// Match: [@value='test'], [@foo]
- /^\[ *(@)([a-z0-9_-]*) *([!*$^=]*) *('?"?)(.*?)\4 *\]/i,
+ /^\[ *(@)([\w-]+) *([!*$^=]*) *('?"?)(.*?)\4 *\]/i,
// Match: [div], [div p]
/^(\[)\s*(.*?(\[.*?\])?[^[]*?)\s*\]/,
// Match: :contains('foo')
- /^(:)([a-z0-9_-]*)\("?'?(.*?(\(.*?\))?[^(]*?)"?'?\)/i,
+ /^(:)([\w-]+)\("?'?(.*?(\(.*?\))?[^(]*?)"?'?\)/i,
- // Match: :even, :last-chlid
- /^([:.#]*)([a-z0-9_*-]*)/i
+ // Match: :even, :last-chlid, #id, .class
+ /^([:.#]*)([\w\u0128-\uFFFF*-]+)/i
],
token: [
/^(\+)/, "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);
}
],
t = t.substr(2,t.length);
// And the / root expression
- } else if ( !t.indexOf("/") ) {
+ } else if ( !t.indexOf("/") && !context.ownerDocument ) {
context = context.documentElement;
t = t.substr(1,t.length);
if ( t.indexOf("/") >= 1 )
}
// Initialize the search
- var ret = [context], done = [], last = null;
+ var ret = [context], done = [], last;
// Continue while a selector expression exists, and while
// we're no longer looping upon ourselves
var r = [];
last = t;
- t = jQuery.trim(t).replace( /^\/\//i, "" );
+ 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*([a-z0-9*-]+)/i;
+ var re = /^[\/>]\s*([\w*-]+)/i;
var m = re.exec(t);
if ( m ) {
ret = r;
t = t.replace( re, "" );
- if ( foundToken = t.indexOf(" ") == 0 )
- continue;
+ if ( t.indexOf(" ") == 0 ) continue;
+ foundToken = true;
} else {
// Look for pre-defined expression tokens
for ( var i = 0; i < jQuery.token.length; i += 2 ) {
if ( ret[0] == context ) ret.shift();
// Merge the result sets
- jQuery.merge( done, ret );
+ done = jQuery.merge( done, ret );
// Reset the context
r = ret = [context];
} else {
// Optomize for the case nodeName#idName
- var re2 = /^([a-z0-9_-]+)(#)([a-z0-9\\*_-]*)/i;
+ var re2 = /^(\w+)(#)([\w\u0128-\uFFFF*-]+)/i;
var m = re2.exec(t);
// Re-organize the results, so that they're consistent
} else {
// Otherwise, do a traditional filter check for
// ID, class, and element selectors
- re2 = /^([#.]?)([a-z0-9\\*_-]*)/i;
+ re2 = /^([#.]?)([\w\u0128-\uFFFF*-]*)/i;
m = re2.exec(t);
}
+ var elem = ret[ret.length-1];
+
// Try to do a global search by ID, where we can
- if ( m[1] == "#" && ret[ret.length-1].getElementById ) {
+ if ( m[1] == "#" && elem && elem.getElementById ) {
// Optimization for HTML document case
- var oid = ret[ret.length-1].getElementById(m[2]);
+ 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] )
+ 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] : [];
+ ret = r = oid && (!m[3] || jQuery.nodeName(oid, m[3])) ? [oid] : [];
} else {
// Pre-compile a regular expression to handle class searches
// 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
- jQuery.each( ret, function(){
+ 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 <object>s
- if ( jQuery.nodeName(this, "object") && tag == "*" )
+ if ( tag == "*" && ret[i].nodeName.toLowerCase() == "object" )
tag = "param";
- jQuery.merge( r,
- m[1] != "" && ret.length != 1 ?
- jQuery.getAll( this, [], m[1], m[2], rec ) :
- this.getElementsByTagName( tag )
- );
- });
+ r = jQuery.merge( r, ret[i].getElementsByTagName( tag ));
+ }
// It's faster to filter by class and be done with it
- if ( m[1] == "." && ret.length == 1 )
+ if ( m[1] == "." )
r = jQuery.grep( r, function(e) {
return rec.test(e.className);
});
// Same with ID filtering
- if ( m[1] == "#" && ret.length == 1 ) {
+ if ( m[1] == "#" ) {
// Remember, then wipe out, the result set
var tmp = r;
r = [];
}
}
+ // An error occurred with the selector;
+ // just return an empty set instead
+ if ( t )
+ ret = [];
+
// Remove the root context
- if ( ret && ret[0] == context ) ret.shift();
+ if ( ret && ret[0] == context )
+ ret.shift();
// And combine the results
- jQuery.merge( done, ret );
+ done = jQuery.merge( done, ret );
return done;
},
filter: function(t,r,not) {
+ var last;
+
// Look for common filter expressions
- while ( t && /^[a-z[({<*:.#]/i.test(t) ) {
+ while ( t && t != last ) {
+ last = t;
var p = jQuery.parse, m;
}
});
+ if ( !m )
+ continue;
+
// :not() is a special case that can be optimized by
// keeping it out of the expression list
if ( m[1] == ":" && m[2] == "not" )
// and the modified expression string (t)
return { r: r, t: t };
},
-
- getAll: function( o, r, token, name, re ) {
- for ( var s = o.firstChild; s; s = s.nextSibling )
- if ( s.nodeType == 1 ) {
- var add = true;
-
- if ( token == "." )
- add = s.className && re.test(s.className);
- else if ( token == "#" )
- add = s.getAttribute("id") == name;
-
- if ( add )
- r.push( s );
-
- if ( token == "#" && r.length ) break;
-
- if ( s.firstChild )
- jQuery.getAll( s, r, token, name, re );
- }
-
- return r;
- },
/**
* All ancestors of a given element.
git.asbjorn.biz / jquery.git / blobdiff