From 0d149e52e6d3326730c6a5e688d5496a7ab91a87 Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=B6rn=20Zaefferer?= <joern.zaefferer@gmail.com>
Date: Wed, 20 Dec 2006 11:05:08 +0000
Subject: [PATCH] Improved event fixing, using less browser and more object
 detection

---
 newandnoteworthy.txt |  1 +
 src/jquery/jquery.js | 28 +++++++++++++---------------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/newandnoteworthy.txt b/newandnoteworthy.txt
index dc8d5f733..638f66b40 100644
--- a/newandnoteworthy.txt
+++ b/newandnoteworthy.txt
@@ -7,6 +7,7 @@ New and Noteworthy
  - Fixed synchronous requests
  - $.get, $.getIfModified, $.post, $.getScript and $.getJSON now all pass through the XMLHttpRequest as returned by $.ajax
  - Improved AJAX docs (eg. more examples for $.ajax
+ - Improved event fixing, using less browser and more object detection
 
 1.0.4
 -----
diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index 025dd770b..fd6d3a267 100644
--- a/src/jquery/jquery.js
+++ b/src/jquery/jquery.js
@@ -1960,9 +1960,6 @@ jQuery.extend({
 
 			event = jQuery.event.fix( event || window.event || {} ); // Empty object is for triggered events with no data
 
-			// If no correct event was found, fail
-			if ( !event ) return false;
-
 			var returnValue = true;
 
 			var c = this.events[event.type];
@@ -1985,20 +1982,19 @@ jQuery.extend({
 		},
 
 		fix: function(event) {
-			// check IE
-			if(jQuery.browser.msie) {
-				// fix target property, if available
-				// check prevents overwriting of fake target coming from trigger
-				if(event.srcElement)
-					event.target = event.srcElement;
-					
-				// calculate pageX/Y
+			// fix target property, if available
+			if(event.srcElement)
+				event.target = event.srcElement;
+		
+			// calculate pageX/Y if missing
+			if(typeof event.pageX == "undefined") {
 				var e = document.documentElement, b = document.body;
 				event.pageX = event.clientX + (e.scrollLeft || b.scrollLeft);
 				event.pageY = event.clientY + (e.scrollTop || b.scrollTop);
+			}
 					
-			// check safari and if target is a textnode
-			} else if(jQuery.browser.safari && event.target.nodeType == 3) {
+			// check if target is a textnode (only for safari)
+			if(jQuery.browser.safari && event.target.nodeType == 3) {
 				// target is readonly, clone the event object
 				event = jQuery.extend({}, event);
 				// get parentnode from textnode
@@ -2006,15 +2002,17 @@ jQuery.extend({
 			}
 			
 			// fix preventDefault and stopPropagation
-			if (!event.preventDefault)
+			if (!event.preventDefault) {
 				event.preventDefault = function() {
 					this.returnValue = false;
 				};
+			}
 				
-			if (!event.stopPropagation)
+			if (!event.stopPropagation) {
 				event.stopPropagation = function() {
 					this.cancelBubble = true;
 				};
+			}
 				
 			return event;
 		}
-- 
2.39.5