]> source.dussan.org Git - jquery.git/commitdiff
Remove the rarely-used pseudos from quickis.html
authorDave Methvin <dave.methvin@gmail.com>
Wed, 21 Sep 2011 13:40:57 +0000 (09:40 -0400)
committerDave Methvin <dave.methvin@gmail.com>
Wed, 21 Sep 2011 13:40:57 +0000 (09:40 -0400)
The cutting will continue until file size is improved.

src/event.js
test/unit/event.js

index 04589bcfce1d1da9ce8610c29a5670fe06fe01ec..02c26dc23a236348dc18f86852f037ff8a201c3f 100644 (file)
@@ -7,20 +7,14 @@ var rnamespaces = /\.(.*)$/,
        rescape = /[^\w\s.|`]/g,
        rtypenamespace = /^([^\.]*)?(?:\.(.+))?$/,
        rhoverHack =  /\bhover(\.\S+)?/,
-       rquickIs = /^([\w\-]+)?(?:#([\w\-]+))?(?:\.([\w\-]+))?(?:\[([\w+\-]+)=["']?([\w\-]*)["']?\])?(?::(first-child|last-child|empty))?$/,
-       quickPseudoMap = {
-               "empty": "firstChild",
-               "first-child": "previousSibling",
-               "last-child": "nextSibling"
-       },
+       rquickIs = /^([\w\-]+)?(?:#([\w\-]+))?(?:\.([\w\-]+))?(?:\[([\w+\-]+)=["']?([\w\-]*)["']?\])?$/,
        quickParse = function( selector ) {
                var quick = rquickIs.exec( selector );
                if ( quick ) {
-                       //   0  1    2   3      4         5          6
-                       // [ _, tag, id, class, attrName, attrValue, :(empty first-child last-child) ]
+                       //   0  1    2   3      4         5
+                       // [ _, tag, id, class, attrName, attrValue ]
                        quick[1] = ( quick[1] || "" ).toLowerCase();
                        quick[3] = quick[3] && new RegExp( "\\b" + quick[3] + "\\b" );
-                       quick[6] = quickPseudoMap[ quick[6] ];
                }
                return quick;
        },
@@ -29,8 +23,7 @@ var rnamespaces = /\.(.*)$/,
                        (!m[1] || elem.nodeName.toLowerCase() === m[1]) && 
                        (!m[2] || elem.id === m[2]) && 
                        (!m[3] || m[3].test( elem.className )) &&
-                       (!m[4] || elem.getAttribute( m[4] ) == m[5]) &&
-                       (!m[6] || !elem[ m[6] ])
+                       (!m[4] || elem.getAttribute( m[4] ) == m[5])
                );
        },
        useNativeMethod = function( event ) {
index a7a989a567b0efee65b2a8769c945a1ba40260c1..9a03bb32cdbaaaf57874f90631c9182be200e3f4 100644 (file)
@@ -2337,7 +2337,7 @@ test(".on and .off", function() {
 });
 
 test("delegated events quickIs", function() {
-       expect(23);
+       expect(17);
        var markup = jQuery( 
                        '<div>'+
                                '<p class="D">'+
@@ -2369,19 +2369,16 @@ test("delegated events quickIs", function() {
                .on( "blink", "p.d", func )
                .on( "blink", "[devo=cool]", func )
                .on( "blink", "[devo='NO']", func )
-               .on( "blink", "#famous", func )
-               .on( "blink", "em:empty", func )
-               .on( "blink", ":first-child", func )
-               .on( "blink", "em:last-child", func );
+               .on( "blink", "#famous", func );
 
-       check( "[devo=cool]", "b|[devo=cool] p|.D p|:first-child" );
+       check( "[devo=cool]", "b|[devo=cool] p|.D" );
        check( "[devo='']", "" );
-       check( "p", "p|.D p|:first-child" );
-       check( "b", "b|[devo=cool] p|.D p|:first-child" );
-       check( "em", "em|em q|#famous em|em em|em:empty em|em:last-child q|#famous" );
+       check( "p", "p|.D" );
+       check( "b", "b|[devo=cool] p|.D" );
+       check( "em", "em|em q|#famous em|em q|#famous" );
        
        markup.find( "b" ).attr( "devo", "NO" );
-       check( "b", "b|[devo='NO'] p|.D p|:first-child" );
+       check( "b", "b|[devo='NO'] p|.D" );
 
        markup.remove();
 });