X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fevent%2Fevent.js;h=9dff1b2cd60c732a0199421e7c522700e1fc1f74;hb=15faf783b9c3c454868b5054fdcfb63e8950abf9;hp=a4a99d99c2cae9a54982bc3600431868a6ccfbf8;hpb=f53aa62fd3f08ad7a05e99e3836132216a8d5c7d;p=jquery.git

diff --git a/src/event/event.js b/src/event/event.js
index a4a99d9..9dff1b2 100644
--- a/src/event/event.js
+++ b/src/event/event.js
@@ -142,9 +142,12 @@ jQuery.event = {
 			// Trigger the event
 			if ( jQuery.isFunction( element.$handle ) )
 				val = element.$handle.apply( element, data );
+
+			// Handle triggering native .onfoo handlers
 			if ( !fn && element["on"+type] && element["on"+type].apply( element, data ) === false )
 				val = false;
 
+			// Trigger the native events (except for clicks on links)
 			if ( fn && val !== false && !(jQuery.nodeName(element, 'a') && type == "click") ) {
 				this.triggered = true;
 				element[ type ]();
@@ -152,6 +155,8 @@ jQuery.event = {
 
 			this.triggered = false;
 		}
+
+		return val;
 	},
 
 	handle: function(event) {
@@ -170,10 +175,14 @@ jQuery.event = {
 			args[0].handler = c[j];
 			args[0].data = c[j].data;
 
-			if ( c[j].apply( this, args ) === false ) {
+			var tmp = c[j].apply( this, args );
+
+			if ( val !== false )
+				val = tmp;
+
+			if ( tmp === false ) {
 				event.preventDefault();
 				event.stopPropagation();
-				val = false;
 			}
 		}