X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fevent%2Fevent.js;h=051ba00a904c6688212f9822159428cd8b3da592;hb=18e563abe53d7a7fb4169c869f01812c119ae191;hp=07126cea33f3ffb658cc0bbeae9df1442184141c;hpb=a42a8e5afa2e4ca7690081bce9899d5e6e0d1cf4;p=jquery.git

diff --git a/src/event/event.js b/src/event/event.js
index 07126ce..051ba00 100644
--- a/src/event/event.js
+++ b/src/event/event.js
@@ -2,7 +2,7 @@ jQuery.fn.extend({
 
 	// We're overriding the old toggle function, so
 	// remember it for later
-	//_toggle: jQuery.fn.toggle,
+	_toggle: jQuery.fn.toggle,
 	
 	/**
 	 * Toggle between two function calls every other click.
@@ -25,7 +25,7 @@ jQuery.fn.extend({
 	toggle: function(a,b) {
 		// If two functions are passed in, we're
 		// toggling on a click
-		return a && b ? this.click(function(e){
+		return a && b && a.constructor == Function && b.constructor == Function ? this.click(function(e){
 			// Figure out which function to execute
 			this.last = this.last == a ? b : a;
 			
@@ -37,7 +37,7 @@ jQuery.fn.extend({
 		}) :
 		
 		// Otherwise, execute the old toggle function
-		this._toggle();
+		this._toggle.apply( this, arguments );
 	},
 	
 	/**
@@ -1634,8 +1634,9 @@ new function(){
 		// Use the defer script hack
 		var script = document.getElementById("__ie_init");
 		script.onreadystatechange = function() {
-			if ( this.readyState == "complete" )
-				jQuery.ready();
+			if ( this.readyState != "complete" ) return;
+			this.parentNode.removeChild( this );
+			jQuery.ready();
 		};
 	
 		// Clear from memory
@@ -1657,9 +1658,9 @@ new function(){
 				jQuery.ready();
 			}
 		}, 10);
-	} else {
-		// A fallback to window.onload, that will always work
-		jQuery.event.add( window, "load", jQuery.ready );
-	}
+	} 
+
+	// A fallback to window.onload, that will always work
+	jQuery.event.add( window, "load", jQuery.ready );
 	
 };