Added a fix for relative // - $("//div",this) (bug #1418)
[jquery.git] / src / selector / selector.js
index 5f6f87b..2cf0b64 100644 (file)
@@ -63,7 +63,7 @@ jQuery.extend({
 
                // Match: :even, :last-chlid, #id, .class
                new RegExp("^([:.#]*)(" + 
-                       ( jQuery.chars = "(?:[\\w\u0128-\uFFFF*_-]|\\\\.)" ) + "+)")
+                       ( jQuery.chars = jQuery.browser.safari && parseInt(jQuery.browser.version) < 417 ? "(?:[\\w*_-]|\\\\.)" : "(?:[\\w\u0128-\uFFFF*_-]|\\\\.)" ) + "+)")
        ],
 
        multiFilter: function( expr, elems, not ) {
@@ -99,7 +99,7 @@ jQuery.extend({
 
                // Handle the common XPath // expression
                if ( !t.indexOf("//") ) {
-                       context = context.documentElement;
+                       //context = context.documentElement;
                        t = t.substr(2,t.length);
 
                // And the / root expression
@@ -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;
@@ -142,7 +142,7 @@ jQuery.extend({
                                if ( t.indexOf(" ") == 0 ) continue;
                                foundToken = true;
                        } else {
-                               re = /^((\/?\.\.)|([>\/+~]))\s*([a-z]*)/i;
+                               re = /^((\/?\.\.)|([>\/+~]))\s*(\w*)/i;
 
                                if ( (m = re.exec(t)) != null ) {
                                        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 );
                                                                        }
@@ -193,7 +193,7 @@ jQuery.extend({
                                        t = " " + t.substr(1,t.length);
 
                                } else {
-                                       // Optomize for the case nodeName#idName
+                                       // Optimize for the case nodeName#idName
                                        var re2 = new RegExp("^(" + jQuery.chars + "+)(#)(" + jQuery.chars + "+)");
                                        var m = re2.exec(t);