X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fevent%2Fevent.js;h=b13e5a02f36d2b01ba1e72f41b64d788d6a5a562;hb=e6c067858ec7f2c4e3e7da90f16c695f93a4ee07;hp=f7cc9934dbc322ce3101b587c9490eb2bad15119;hpb=9e83f1b65fa34e97cfd86ba17514d014749360e8;p=jquery.git

diff --git a/src/event/event.js b/src/event/event.js
index f7cc993..b13e5a0 100644
--- a/src/event/event.js
+++ b/src/event/event.js
@@ -148,11 +148,15 @@ jQuery.event = {
 			data.unshift( this.fix({ type: type, target: element }) );
 
 			// Trigger the event
-			if ( jQuery.isFunction(element.$handle) && (val = element.$handle.apply( element, data )) !== false )
-				this.triggered = true;
+			if ( jQuery.isFunction( element.$handle ) )
+				val = element.$handle.apply( element, data );
+			if ( !fn && element["on"+type] && element["on"+type].apply( element, data ) === false )
+				val = false;
 
-			if ( fn && val !== false && !jQuery.nodeName(element, 'a') )
+			if ( fn && val !== false && !jQuery.nodeName(element, 'a') ) {
+				this.triggered = true;
 				element[ type ]();
+			}
 
 			this.triggered = false;
 		}
@@ -227,8 +231,8 @@ jQuery.event = {
 		// Calculate pageX/Y if missing and clientX/Y available
 		if ( event.pageX == null && event.clientX != null ) {
 			var e = document.documentElement, b = document.body;
-			event.pageX = event.clientX + (e && e.scrollLeft || b.scrollLeft);
-			event.pageY = event.clientY + (e && e.scrollTop || b.scrollTop);
+			event.pageX = event.clientX + (e && e.scrollLeft || b.scrollLeft || 0);
+			event.pageY = event.clientY + (e && e.scrollTop || b.scrollTop || 0);
 		}
 			
 		// Add which for key events