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

diff --git a/src/event/event.js b/src/event/event.js
index 07126ce..d63b3a0 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 );
 	},
 	
 	/**
@@ -1657,9 +1657,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 );
 	
 };