Changeset 1595

Timestamp:

03/25/07 20:30:16 (1 year ago)

Author:

john

Message:

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.)

Files:

• trunk/jquery/src/selector/selector.js (modified) (5 diffs)

trunk/jquery/src/selector/selector.js

@@ -77 +77 @@
 
         // Match: :even, :last-chlid, #id, .class
-        /^([:.#]*)((?:[\w\u0128-\uFFFF*-]|\\.)+)/
+        new RegExp("^([:.#]*)(" + 
+            ( jQuery.chars = "(?:[\\w\u0128-\uFFFF*-]|\\\\.)" ) + "+)")
     ],
 
@@ -205 +206 @@
                 } else {
                     // Optomize for the case nodeName#idName
-                    var re2 = /^(\w+)(#)((?:[\w\u0128-\uFFFF*-]|\\.)+)/;
+                    var re2 = new RegExp("^(\\w+)(#)(" + jQuery.chars + "+)");
                     var m = re2.exec(t);
                     
@@ -215 +216 @@
                         // Otherwise, do a traditional filter check for
                         // ID, class, and element selectors
-                        re2 = /^([#.]?)((?:[\w\u0128-\uFFFF*-]|\\.)*)/;
+                        re2 = new RegExp("^([#.]?)(" + jQuery.chars + "*)");
                         m = re2.exec(t);
                     }
@@ -230 +231 @@
                         // 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] )
+                        if ( (jQuery.browser.msie||jQuery.browser.opera) && oid && oid.id != m[2] )
                             oid = jQuery('[@id="'+m[2]+'"]', elem)[0];
 
@@ -238 +239 @@
 
                     } else {
-                        // 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
+                        // We need to find all descendant elements
                         for ( var i = 0, rl = ret.length; i < rl; i++ ) {
                             // Grab the tag name being searched for