From 2efd0b4cc5cce9b22cd4bc638e25cc998736b6e7 Mon Sep 17 00:00:00 2001 From: Brandon Aaron Date: Wed, 23 Apr 2008 18:57:17 +0000 Subject: [PATCH] Fixed regression with 5276 where return false in first handler of multiple handlers was ignored. And 5276 log message says 200% but I meant 20%. --- src/event.js | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/event.js b/src/event.js index e08a085c8..25161d3fe 100644 --- a/src/event.js +++ b/src/event.js @@ -231,7 +231,7 @@ jQuery.event = { handle: function(event) { // returned undefined or false - var val, namespace, all, handlers; + var val, ret, namespace, all, handlers; event = arguments[0] = jQuery.event.fix( event || window.event ); @@ -253,14 +253,17 @@ jQuery.event = { event.handler = handler; event.data = handler.data; - val = handler.apply( this, arguments ); + ret = handler.apply( this, arguments ); + + if ( val !== false ) + val = ret; + + if ( ret === false ) { + event.preventDefault(); + event.stopPropagation(); + } } } - - if ( val === false ) { - event.preventDefault(); - event.stopPropagation(); - } // Clean up added properties in IE to prevent memory leak if (jQuery.browser.msie) -- 2.39.5