X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fevent.js;h=007eb1c80bfe9abdf3d2cbc2f450f88e8a35b8f6;hb=9af7387579a4350f66e49324483c6b599f43b9b2;hp=ccbfd2ad4b6feec643f21992dfe29a2d5525c332;hpb=97e98591aaf929bef42bf6047f68e08d8aafc1a4;p=jquery.git

diff --git a/src/event.js b/src/event.js
index ccbfd2a..007eb1c 100644
--- a/src/event.js
+++ b/src/event.js
@@ -332,7 +332,7 @@ jQuery.event = {
 	
 				// If Safari or IE is used
 				// Continually check to see if the document is ready
-				if ((jQuery.browser.msie && !window.frameElement) || jQuery.browser.safari ) (function(){
+				if ((jQuery.browser.msie && window == top) || jQuery.browser.safari ) (function(){
 					try {
 						// If IE is used, use the trick by Diego Perini
 						// http://javascript.nwbox.com/IEContentLoaded/
@@ -366,53 +366,45 @@ jQuery.event = {
 		
 		mouseenter: {
 			setup: function() {
-				if (jQuery.browser.msie) return false;
-				jQuery(this).bind('mouseover', jQuery.event.special.mouseenter.handler);
+				if ( jQuery.browser.msie ) return false;
+				jQuery(this).bind("mouseover", jQuery.event.special.mouseenter.handler);
 				return true;
 			},
 		
 			teardown: function() {
-				if (jQuery.browser.msie) return false;
-				jQuery(this).unbind('mouseover', jQuery.event.special.mouseenter.handler);
+				if ( jQuery.browser.msie ) return false;
+				jQuery(this).unbind("mouseover", jQuery.event.special.mouseenter.handler);
 				return true;
 			},
 			
 			handler: function(event) {
-				var args = Array.prototype.slice.call( arguments, 1 );
 				// If we actually just moused on to a sub-element, ignore it
 				if ( withinElement(event, this) ) return true;
 				// Execute the right handlers by setting the event type to mouseenter
-				event.type = 'mouseenter';
-				// Include the event object as the first argument
-				args.unshift(event);
-				var val = jQuery.event.handle.apply(this, args);
-				return val;
+				arguments[0].type = "mouseenter";
+				return jQuery.event.handle.apply(this, arguments);
 			}
 		},
 	
 		mouseleave: {
 			setup: function() {
-				if (jQuery.browser.msie) return false;
-				jQuery(this).bind('mouseout', jQuery.event.special.mouseleave.handler);
+				if ( jQuery.browser.msie ) return false;
+				jQuery(this).bind("mouseout", jQuery.event.special.mouseleave.handler);
 				return true;
 			},
 		
 			teardown: function() {
-				if (jQuery.browser.msie) return false;
-				jQuery(this).unbind('mouseout', jQuery.event.special.mouseleave.handler);
+				if ( jQuery.browser.msie ) return false;
+				jQuery(this).unbind("mouseout", jQuery.event.special.mouseleave.handler);
 				return true;
 			},
 			
 			handler: function(event) {
-				var args = Array.prototype.slice.call( arguments, 1 );
 				// If we actually just moused on to a sub-element, ignore it
 				if ( withinElement(event, this) ) return true;
 				// Execute the right handlers by setting the event type to mouseleave
-				event.type = 'mouseleave';
-				// Include the event object as the first argument
-				args.unshift(event);
-				var val = jQuery.event.handle.apply(this, args);
-				return val;
+				arguments[0].type = "mouseleave";
+				return jQuery.event.handle.apply(this, arguments);
 			}
 		}
 	}