diff options
| author | Dave Methvin <dave.methvin@gmail.com> | 2011-04-06 10:31:14 -0400 |
|---|---|---|
| committer | Dave Methvin <dave.methvin@gmail.com> | 2011-04-06 10:57:09 -0400 |
| commit | 29386db3196e883bffeda63f9e9db1f9ed336bba (patch) | |
| tree | c2baff3d4b3abd1783752b32df54b3e7013d52ca /src | |
| parent | 246757bacdd6224724c667b7b9812d7d88bdd8e1 (diff) | |
| download | jquery-29386db3196e883bffeda63f9e9db1f9ed336bba.tar.gz jquery-29386db3196e883bffeda63f9e9db1f9ed336bba.zip | |
Sadly, we still have to bubble the event so inline handlers will work.
Diffstat (limited to 'src')
| -rw-r--r-- | src/event.js | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/event.js b/src/event.js index 25168ffb8..acaaf2816 100644 --- a/src/event.js +++ b/src/event.js @@ -71,8 +71,8 @@ jQuery.event = { if ( !eventHandle ) { elemData.handle = eventHandle = function( e ) { - // Handle the second event of a trigger and when - // an event is called after a page has unloaded + // Discard the second event of a jQuery.event.trigger() and + // when an event is called after a page has unloaded return typeof jQuery !== "undefined" && jQuery.event.triggered !== e.type ? jQuery.event.handle.apply( eventHandle.elem, arguments ) : undefined; @@ -281,7 +281,6 @@ jQuery.event = { // Event object or event type var type = event.type || event, ontype = "on" + type, - handling = jQuery.event.global, namespaces = [], cur = elem; @@ -313,7 +312,7 @@ jQuery.event = { event.stopPropagation(); // Save some time, only trigger if we've ever bound an event for this type - if ( handling[ type ] ) { + if ( jQuery.event.global[ type ] ) { // XXX This code smells terrible. event.js should not be directly // inspecting the data cache jQuery.each( jQuery.cache, function() { @@ -361,7 +360,7 @@ jQuery.event = { } catch ( ieError1 ) {} cur = cur.parentNode || cur.ownerDocument; - } while ( cur && !event.isPropagationStopped() && handling[ type ] ); + } while ( cur && !event.isPropagationStopped() ); // If nobody prevented the default action, do it now if ( !event.isDefaultPrevented() ) { |