Added fix for broken child selectors in XML documents, bug #1346.

[jquery.git] / src / selector / selector.js

diff --git a/src/selector/selector.js b/src/selector/selector.js
index 94af81e..7011db3 100644 (file)
--- a/src/selector/selector.js
+++ b/src/selector/selector.js
@@ -53,7 +53,7 @@ jQuery.extend({
        // The regular expressions that power the parsing engine
        parse: [
                // Match: [@value='test'], [@foo]
-               /^\[ *(@)([\w-]+) *([!*$^=]*) *('?"?)(.*?)\4 *\]/,
+               /^\[ *(@)([\w-]+) *([!*$^~=]*) *('?"?)(.*?)\4 *\]/,
 
                // Match: [div], [div p]
                /^(\[)\s*(.*?(\[.*?\])?[^[]*?)\s*\]/,
@@ -63,7 +63,7 @@ jQuery.extend({
 
                // Match: :even, :last-chlid, #id, .class
                new RegExp("^([:.#]*)(" + 
-                       ( jQuery.chars = "(?:[\\w\u0128-\uFFFF*_-]|\\\\.)" ) + "+)")
+                       ( jQuery.chars = jQuery.browser.safari && jQuery.browser.version < "3.0.0" ? "\\w" : "(?:[\\w\u0128-\uFFFF*_-]|\\\\.)" ) + "+)")
        ],
 
        multiFilter: function( expr, elems, not ) {
@@ -134,7 +134,7 @@ jQuery.extend({
                                // Perform our own iteration and filter
                                for ( var i = 0; ret[i]; i++ )
                                        for ( var c = ret[i].firstChild; c; c = c.nextSibling )
-                                               if ( c.nodeType == 1 && (nodeName == "*" || c.nodeName == nodeName.toUpperCase()) )
+                                               if ( c.nodeType == 1 && (nodeName == "*" || c.nodeName.toUpperCase() == nodeName.toUpperCase()) )
                                                        r.push( c );
 
                                ret = r;
@@ -157,7 +157,7 @@ jQuery.extend({
                                                                if ( n.nodeType == 1 ) {
                                                                        if ( m == "~" && n.mergeNum == mergeNum ) break;
                                                                        
-                                                                       if (!nodeName || n.nodeName == nodeName.toUpperCase() ) {
+                                                                       if (!nodeName || n.nodeName.toUpperCase() == nodeName.toUpperCase() ) {
                                                                                if ( m == "~" ) n.mergeNum = mergeNum;
                                                                                r.push( n );
                                                                        }
@@ -340,14 +340,14 @@ jQuery.extend({
                                        var a = r[i], z = a[ jQuery.props[m[2]] || m[2] ];
                                        
                                        if ( z == null || /href|src/.test(m[2]) )
-                                               z = jQuery.attr(a,m[2]);
+                                               z = jQuery.attr(a,m[2]) || '';
 
                                        if ( (type == "" && !!z ||
                                                 type == "=" && z == m[5] ||
                                                 type == "!=" && z != m[5] ||
                                                 type == "^=" && z && !z.indexOf(m[5]) ||
                                                 type == "$=" && z.substr(z.length - m[5].length) == m[5] ||
-                                                type == "*=" && z.indexOf(m[5]) >= 0) ^ not )
+                                                (type == "*=" || type == "~=") && z.indexOf(m[5]) >= 0) ^ not )
                                                        tmp.push( a );
                                }