Changeset 1593

Timestamp:

03/25/07 19:02:31 (2 years ago)

Author:

john

Message:

Fixed some more bugs with the test suite, made some minor file size tweaks to the selector code.

Location:

trunk/jquery

Files:

• build/test/index.html (modified) (1 diff)
• src/selector/selector.js (modified) (7 diffs)
• src/selector/selectorTest.js (modified) (3 diffs)

trunk/jquery/build/test/index.html

@@ -84 +84 @@
             <span id="utf8class1" class="台北Táiběi 台北"></span>
             <span id="utf8class2" class="台北"></span>
+            <span id="foo:bar" class="foo:bar"></span>
+            <span id="test.foo[5]bar" class="test.foo[5]bar"></span>
         </form>
         <b id="floatTest">Float test.</b>

trunk/jquery/src/selector/selector.js

@@ -68 +68 @@
     parse: [
         // Match: [@value='test'], [@foo]
-        /^\[ *(@)([\w-]+) *([!*$^=]*) *('?"?)(.*?)\4 *\]/i,
+        /^\[ *(@)([\w-]+) *([!*$^=]*) *('?"?)(.*?)\4 *\]/,
 
         // Match: [div], [div p]
@@ -74 +74 @@
 
         // Match: :contains('foo')
-        /^(:)([\w-]+)\("?'?(.*?(\(.*?\))?[^(]*?)"?'?\)/i,
+        /^(:)([\w-]+)\("?'?(.*?(\(.*?\))?[^(]*?)"?'?\)/,
 
         // Match: :even, :last-chlid, #id, .class
-        /^([:.#]*)((?:[\w\u0128-\uFFFF*-]|\\.)+)/i
+        /^([:.#]*)((?:[\w\u0128-\uFFFF*-]|\\.)+)/
     ],
 
@@ -149 +149 @@
             // An attempt at speeding up child selectors that
             // point to a specific element tag
-            var re = /^[\/>]\s*([\w*-]+)/i;
+            var re = /^[\/>]\s*([\w*-]+)/;
             var m = re.exec(t);
 
@@ -169 +169 @@
                     // Attempt to match each, individual, token in
                     // the specified order
-                    var re = jQuery.token[i];
+                    var re = jQuery.token[i], fn = jQuery.token[i+1];
                     var m = re.exec(t);
 
@@ -175 +175 @@
                     if ( m ) {
                         // Map it against the token's handler
-                        r = ret = jQuery.map( ret, jQuery.isFunction( jQuery.token[i+1] ) ?
-                            jQuery.token[i+1] :
-                            function(a){ return eval(jQuery.token[i+1]); });
+                        r = ret = jQuery.map( ret, jQuery.isFunction( fn ) ?
+                            fn : new Function( "a", "return " + fn ) );
 
                         // And remove the token
@@ -206 +205 @@
                 } else {
                     // Optomize for the case nodeName#idName
-                    var re2 = /^(\w+)(#)((?:[\w\u0128-\uFFFF*-]|\\.)+)/i;
+                    var re2 = /^(\w+)(#)((?:[\w\u0128-\uFFFF*-]|\\.)+)/;
                     var m = re2.exec(t);
                     
@@ -216 +215 @@
                         // Otherwise, do a traditional filter check for
                         // ID, class, and element selectors
-                        re2 = /^([#.]?)((?:[\w\u0128-\uFFFF*-]|\\.)*)/i;
+                        re2 = /^([#.]?)((?:[\w\u0128-\uFFFF*-]|\\.)*)/;
                         m = re2.exec(t);
                     }

trunk/jquery/src/selector/selectorTest.js

@@ -153 +153 @@
     t( "Only Child", "a:only-child", ["simon1","anchor1","yahoo","anchor2"] );
     t( "Empty", "ul:empty", ["firstUL"] );
-    t( "Enabled UI Element", "input:enabled", ["text1","radio1","radio2","check1","check2","hidden1","hidden2","name"] );
+    t( "Enabled UI Element", "input:enabled", ["text1","radio1","radio2","check1","check2","hidden1","hidden2","name","length"] );
     t( "Disabled UI Element", "input:disabled", ["text2"] );
     t( "Checked UI Element", "input:checked", ["radio2","check1"] );
@@ -171 +171 @@
     t( "Position Less Than", "p:lt(3)", ["firstp","ap","sndp"] );
     t( "Is A Parent", "p:parent", ["firstp","ap","sndp","en","sap","first"] );
-    t( "Is Visible", "input:visible", ["text1","text2","radio1","radio2","check1","check2","name"] );
+    t( "Is Visible", "input:visible", ["text1","text2","radio1","radio2","check1","check2","name","length"] );
     t( "Is Hidden", "input:hidden", ["hidden1","hidden2"] );
     
-    t( "Form element :input", ":input", ["text1", "text2", "radio1", "radio2", "check1", "check2", "hidden1", "hidden2", "name", "button", "area1", "select1", "select2", "select3"] );
+    t( "Form element :input", ":input", ["text1", "text2", "radio1", "radio2", "check1", "check2", "hidden1", "hidden2", "name", "button", "area1", "select1", "select2", "select3", "length"] );
     t( "Form element :radio", ":radio", ["radio1", "radio2"] );
     t( "Form element :checkbox", ":checkbox", ["check1", "check2"] );
-    t( "Form element :text", ":text", ["text1", "text2", "hidden2", "name"] );
+    t( "Form element :text", ":text", ["text1", "text2", "hidden2", "name", "length"] );
     t( "Form element :radio:checked", ":radio:checked", ["radio2"] );
     t( "Form element :checkbox:checked", ":checkbox:checked", ["check1"] );
@@ -196 +196 @@
     t( "Attribute Equals", "//a[@rel='bookmark']", ["simon1"] );
     t( "Parent Axis", "//p/..", ["main","foo"] );
-    t( "Sibling Axis", "//p/../", ["firstp","ap","foo","first","firstUL","empty","form","floatTest","iframe","sndp","en","sap"] );
-    t( "Sibling Axis", "//p/../*", ["firstp","ap","foo","first","firstUL","empty","form","floatTest","iframe","sndp","en","sap"] );
+    t( "Sibling Axis", "//p/../", ["firstp","ap","foo","first","firstUL","empty","form","floatTest","iframe","lengthtest","sndp","en","sap"] );
+    t( "Sibling Axis", "//p/../*", ["firstp","ap","foo","first","firstUL","empty","form","floatTest","iframe","lengthtest","sndp","en","sap"] );
     t( "Has Children", "//p[a]", ["firstp","ap","en","sap"] );