X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=sidebyside;f=jquery%2Fjquery.js;h=419b6e135de58aa8def6c9db1e47ea9d36694025;hb=0027439156fb97bef30f6084d85898ec5b16155f;hp=66a3af8ce8ce3cd34ce529c798af4195bc20e5d2;hpb=abf30546672d605b5fa7d539ef00f53b1a415135;p=jquery.git

diff --git a/jquery/jquery.js b/jquery/jquery.js
index 66a3af8..419b6e1 100644
--- a/jquery/jquery.js
+++ b/jquery/jquery.js
@@ -13,7 +13,7 @@
 window.undefined = window.undefined;
 
 // Map over the $ in case of overwrite
-if ( $ ) var ._$ = $;
+if ( $ ) var _$ = $;
 
 /**
  * Create a new jQuery Object
@@ -804,15 +804,20 @@ jQuery.event = {
 	},
 	
 	handle: function(event) {
-		if ( !event && !window.event ) return;
+		// Handle adding events to items in IFrames, in IE
+		event = event ||
+			jQuery.event.fix( ((this.ownerDocument || this.document || 
+				this).parentWindow || window).event );
+
+		// If no correct event was found, fail
+		if ( !event ) return;
 	
 		var returnValue = true, handlers = [];
-		event = event || jQuery.event.fix(window.event);
 	
 		for ( var j in this.events[event.type] )
 			handlers[handlers.length] = this.events[event.type][j];
 	
-		for ( var i = 0; i < handlers.length; i++ ) {
+		for ( var i = 0; i < handlers.length; i++ )
 			if ( handlers[i].constructor == Function ) {
 				this.handleEvent = handlers[i];
 				if (this.handleEvent(event) === false) {
@@ -821,18 +826,19 @@ jQuery.event = {
 					returnValue = false;
 				}
 			}
-		}
 		return returnValue;
 	},
 	
 	fix: function(event) {
-		event.preventDefault = function() {
-			this.returnValue = false;
-		};
+		if ( event ) {
+			event.preventDefault = function() {
+				this.returnValue = false;
+			};
 		
-		event.stopPropagation = function() {
-			this.cancelBubble = true;
-		};
+			event.stopPropagation = function() {
+				this.cancelBubble = true;
+			};
+		}
 		
 		return event;
 	}