deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Opera is also vulnerable to the getElementById-returning-name issue, fixed it there as well. Also had to tweak the UTF8 regexps to work in Safari (Safari doesn't support \uXXXX in RegExps, lame.)

Browse source
This commit is contained in:
John Resig 2007-03-25 20:30:16 +00:00
parent 44769df602
commit 3446c3af76
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/selector/selector.js
View file

@ -76,7 +76,8 @@ jQuery.extend({
/^(:)([\w-]+)\("?'?(.*?(\(.*?\))?[^(]*?)"?'?\)/, /^(:)([\w-]+)\("?'?(.*?(\(.*?\))?[^(]*?)"?'?\)/,
// Match: :even, :last-chlid, #id, .class // Match: :even, :last-chlid, #id, .class
/^([:.#]*)((?:[\w\u0128-\uFFFF*-]|\\.)+)/ new RegExp("^([:.#]*)(" +
( jQuery.chars = "(?:[\\w\u0128-\uFFFF*-]|\\\\.)" ) + "+)")
], ],
token: [ token: [
@ -204,7 +205,7 @@ jQuery.extend({
} else { } else {
// Optomize for the case nodeName#idName // Optomize for the case nodeName#idName
var re2 = /^(\w+)(#)((?:[\w\u0128-\uFFFF*-]|\\.)+)/; var re2 = new RegExp("^(\\w+)(#)(" + jQuery.chars + "+)");
var m = re2.exec(t); var m = re2.exec(t);
// Re-organize the results, so that they're consistent // Re-organize the results, so that they're consistent
@ -214,7 +215,7 @@ jQuery.extend({
} else { } else {
// Otherwise, do a traditional filter check for // Otherwise, do a traditional filter check for
// ID, class, and element selectors // ID, class, and element selectors
re2 = /^([#.]?)((?:[\w\u0128-\uFFFF*-]|\\.)*)/; re2 = new RegExp("^([#.]?)(" + jQuery.chars + "*)");
m = re2.exec(t); m = re2.exec(t);
} }
@ -229,7 +230,7 @@ jQuery.extend({
// Do a quick check for the existence of the actual ID attribute // Do a quick check for the existence of the actual ID attribute
// to avoid selecting by the name attribute in IE // to avoid selecting by the name attribute in IE
if ( jQuery.browser.msie && oid && oid.id != m[2] ) if ( (jQuery.browser.msie||jQuery.browser.opera) && oid && oid.id != m[2] )
oid = jQuery('[@id="'+m[2]+'"]', elem)[0]; oid = jQuery('[@id="'+m[2]+'"]', elem)[0];
// Do a quick check for node name (where applicable) so // Do a quick check for node name (where applicable) so
@ -237,9 +238,7 @@ jQuery.extend({
ret = r = oid && (!m[3] || jQuery.nodeName(oid, m[3])) ? [oid] : []; ret = r = oid && (!m[3] || jQuery.nodeName(oid, m[3])) ? [oid] : [];
} else { } else {
// We need to find all descendant elements, it is more // We need to find all descendant elements
// 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 // Grab the tag name being searched for
var tag = m[1] != "" || m[0] == "" ? "*" : m[2]; var tag = m[1] != "" || m[0] == "" ? "*" : m[2];