X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fevent%2Fevent.js;h=1b24a31e7447ecef7bc32c2bf5b5f73d5ba7a70f;hb=760a244dbdca7b5a93d147c62ac37ff6eeb9573b;hp=5d8e89aa84c535d89815b046e6eb482cb771f232;hpb=af329ed00b0499a8d393f132d2765d02144f6820;p=jquery.git

diff --git a/src/event/event.js b/src/event/event.js
index 5d8e89a..1b24a31 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') && type == "click") ) {
+				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
@@ -482,7 +486,7 @@ jQuery.fn.extend({
 			var p = e.relatedTarget;
 	
 			// Traverse up the tree
-			while ( p && p != this ) try { p = p.parentNode } catch(e) { p = this; };
+			while ( p && p != this ) try { p = p.parentNode; } catch(e) { p = this; };
 			
 			// If we actually just moused on to a sub-element, ignore it
 			if ( p == this ) return false;
@@ -541,7 +545,7 @@ jQuery.fn.extend({
 		// Otherwise, remember the function for later
 		else
 			// Add the function to the wait list
-			jQuery.readyList.push( function() { return f.apply(this, [jQuery]) } );
+			jQuery.readyList.push( function() { return f.apply(this, [jQuery]); } );
 	
 		return this;
 	}
@@ -954,7 +958,7 @@ new function(){
 		// script does not exist if jQuery is loaded dynamically
 		if ( script ) 
 			script.onreadystatechange = function() {
-				if ( this.readyState != "complete" ) return;
+				if ( document.readyState != "complete" ) return;
 				jQuery.ready();
 			};