Skip to content
Permalink
Browse files

Make sure that [name=foo] and #id selectors don't use the native meth…

…ods on XML documents (since id and name attributes may not be defined by a DTD and will return nothing instead. Fixes jQuery bug #3945.
  • Loading branch information...
jeresig committed Jan 21, 2009
1 parent f9a5849 commit 7d9d2105406fe7fcdc196df860ca155c3e4c8453
Showing with 15 additions and 9 deletions.
  1. +9 −7 src/selector.js
  2. +6 −2 test/unit/selector.js
@@ -55,7 +55,7 @@ var Sizzle = function(selector, context, results, seed) {
} else {
var ret = seed ?
{ expr: parts.pop(), set: makeArray(seed) } :
Sizzle.find( parts.pop(), parts.length === 1 && context.parentNode ? context.parentNode : context );
Sizzle.find( parts.pop(), parts.length === 1 && context.parentNode ? context.parentNode : context, isXML(context) );
set = Sizzle.filter( ret.expr, ret.set );

if ( parts.length > 0 ) {
@@ -120,7 +120,7 @@ Sizzle.matches = function(expr, set){
return Sizzle(expr, null, null, set);
};

Sizzle.find = function(expr, context){
Sizzle.find = function(expr, context, isXML){
var set, match;

if ( !expr ) {
@@ -135,7 +135,7 @@ Sizzle.find = function(expr, context){

if ( left.substr( left.length - 1 ) !== "\\" ) {
match[1] = (match[1] || "").replace(/\\/g, "");
set = Expr.find[ type ]( match, context );
set = Expr.find[ type ]( match, context, isXML );
if ( set != null ) {
expr = expr.replace( Expr.match[ type ], "" );
break;
@@ -315,14 +315,16 @@ var Expr = Sizzle.selectors = {
}
},
find: {
ID: function(match, context){
if ( context.getElementById ) {
ID: function(match, context, isXML){
if ( typeof context.getElementById !== "undefined" && !isXML ) {
var m = context.getElementById(match[1]);
return m ? [m] : [];
}
},
NAME: function(match, context){
return context.getElementsByName ? context.getElementsByName(match[1]) : null;
NAME: function(match, context, isXML){
if ( typeof context.getElementsByName !== "undefined" && !isXML ) {
return context.getElementsByName(match[1]);
}
},
TAG: function(match, context){
return context.getElementsByTagName(match[1]);
@@ -21,11 +21,15 @@ test("element", function() {
});

if ( location.protocol != "file:" ) {
test("Element Selector with underscore", function() {
expect(1);
test("XML Document Selectors", function() {
expect(5);
stop();
jQuery.get("data/with_fries.xml", function(xml) {
equals( jQuery("foo_bar", xml).length, 1, "Element Selector with underscore" );
equals( jQuery("property[name=prop2]", xml).length, 1, "Attribute selector with name" );
equals( jQuery("[name=prop2]", xml).length, 1, "Attribute selector with name" );
equals( jQuery("#seite1", xml).length, 1, "Attribute selector with name" );
equals( jQuery("component#seite1", xml).length, 1, "Attribute selector with name" );
start();
});
});

0 comments on commit 7d9d210

Please sign in to comment.
You can’t perform that action at this time.