Honor stopImmediatePropagation for live/delegate event handlers. Fixes #7217.

[jquery.git] / src / event.js

diff --git a/src/event.js b/src/event.js
index fb5a3ef..959e89c 100644 (file)
--- a/src/event.js
+++ b/src/event.js
@@ -32,6 +32,9 @@ jQuery.event = {
 
                if ( handler === false ) {
                        handler = returnFalse;
+               } else if ( !handler ) {
+                 // Fixes bug #7229. Fix recommended by jdalton
+                 return;
                }
 
                var handleObjIn, handleObj;
@@ -1129,6 +1132,9 @@ function liveHandler( event ) {
                        if ( ret === false ) {
                                stop = false;
                        }
+                       if ( event.isImmediatePropagationStopped() ) {
+                               break;
+                       }
                }
        }