]> source.dussan.org Git - jquery.git/commitdiff
Merge branch '8789-fun-with-fix' of https://github.com/rwldrn/jquery into fix-8789...
authorDave Methvin <dave.methvin@gmail.com>
Sun, 25 Sep 2011 02:26:41 +0000 (22:26 -0400)
committerDave Methvin <dave.methvin@gmail.com>
Sun, 25 Sep 2011 02:37:16 +0000 (22:37 -0400)
Conflicts:
src/event.js
test/unit/event.js

1  2 
src/event.js
test/unit/event.js

diff --cc src/event.js
index ffb818d968ad355ed78ec8cb5750bf75610724a1,1ac5a29319421cba5af7937f6bf53f612b252dc8..699b9381ef5900b49171c1688b9680080e0076f3
@@@ -20,10 -29,11 +20,10 @@@ var rnamespaces = /\.(.*)$/
        },
        quickIs = function( elem, m ) {
                return (
-                       (!m[1] || elem.nodeName.toLowerCase() === m[1]) && 
-                       (!m[2] || elem.id === m[2]) && 
+                       (!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 ) {
Simple merge