X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fevent%2Fevent.js;h=9adf477d05d24a9cf85220ab75796be257970ffb;hb=74a8e206231162b005d95b667343678f786ae272;hp=02f3f819890e1279cdab73473e12974e3458581e;hpb=370c6d564a295cf7d5ccdcafc1bb66d07d615014;p=jquery.git

diff --git a/src/event/event.js b/src/event/event.js
index 02f3f81..9adf477 100644
--- a/src/event/event.js
+++ b/src/event/event.js
@@ -12,38 +12,58 @@ jQuery.event = {
 		// around, causing it to be cloned in the process
 		if ( jQuery.browser.msie && element.setInterval != undefined )
 			element = window;
+		
+		// if data is passed, bind to handler 
+		if( data != undefined ) { 
+        	// Create temporary function pointer to original handler 
+			var fn = handler; 
+
+			// Create unique handler function, wrapped around original handler 
+			handler = function() { 
+				// Pass arguments and context to original handler 
+				return fn.apply(this, arguments); 
+			};
 
-		// if data is passed, bind to handler
-		if( data ) 
+			// Store data in unique handler 
 			handler.data = data;
 
+			// Set the guid of unique handler to the same of original handler, so it can be removed 
+			handler.guid = fn.guid;
+		}
+
 		// Make sure that the function being executed has a unique ID
-		if ( !handler.guid )
+		if ( !handler.guid ) {
 			handler.guid = this.guid++;
+			// Don't forget to set guid for the original handler function
+			if (fn) fn.guid = handler.guid;
+		}
 
 		// Init the element's event structure
-		if (!element.events)
-			element.events = {};
+		if (!element.$events)
+			element.$events = {};
+		
+		if (!element.$handle)
+			element.$handle = function() {
+				jQuery.event.handle.apply(element, arguments);
+			};
 
 		// Get the current list of functions bound to this event
-		var handlers = element.events[type];
+		var handlers = element.$events[type];
 
-		// If it hasn't been initialized yet
+		// Init the event handler queue
 		if (!handlers) {
-			// Init the event handler queue
-			handlers = element.events[type] = {};
-
-			// Remember an existing handler, if it's already there
-			if (element["on" + type])
-				handlers[0] = element["on" + type];
+			handlers = element.$events[type] = {};	
+			
+			// And bind the global event handler to the element
+			if (element.addEventListener)
+				element.addEventListener(type, element.$handle, false);
+			else if (element.attachEvent)
+				element.attachEvent("on" + type, element.$handle);
 		}
 
 		// Add the function to the element's handler list
 		handlers[handler.guid] = handler;
 
-		// And bind the global event handler to the element
-		element["on" + type] = this.handle;
-
 		// Remember the function in a global list (for triggering)
 		if (!this.global[type])
 			this.global[type] = [];
@@ -55,52 +75,89 @@ jQuery.event = {
 
 	// Detach an event or set of events from an element
 	remove: function(element, type, handler) {
-		if (element.events)
-			if ( type && type.type )
-				delete element.events[ type.type ][ type.handler.guid ];
-			else if (type && element.events[type])
+		var events = element.$events, ret;
+
+		if ( events ) {
+			// type is actually an event object here
+			if ( type && type.type ) {
+				handler = type.handler;
+				type = type.type;
+			}
+			
+			if ( !type ) {
+				for ( type in events )
+					this.remove( element, type );
+
+			} else if ( events[type] ) {
+				// remove the given handler for the given type
 				if ( handler )
-					delete element.events[type][handler.guid];
+					delete events[type][handler.guid];
+				
+				// remove all handlers for the given type
 				else
-					for ( var i in element.events[type] )
-						delete element.events[type][i];
-			else
-				for ( var j in element.events )
-					this.remove( element, j );
+					for ( handler in element.$events[type] )
+						delete events[type][handler];
+
+				// remove generic event handler if no more handlers exist
+				for ( ret in events[type] ) break;
+				if ( !ret ) {
+					if (element.removeEventListener)
+						element.removeEventListener(type, element.$handle, false);
+					else if (element.detachEvent)
+						element.detachEvent("on" + type, element.$handle);
+					ret = null;
+					delete events[type];
+				}
+			}
+
+			// Remove the expando if it's no longer used
+			for ( ret in events ) break;
+			if ( !ret )
+				element.$handle = element.$events = null;
+		}
 	},
 
-	trigger: function(type,data,element) {
+	trigger: function(type, data, element) {
 		// Clone the incoming data, if any
 		data = jQuery.makeArray(data || []);
 
 		// Handle a global trigger
-		if ( !element ) {
-			var g = this.global[type];
-			if ( g )
-				for ( var i = 0, gl = g.length; i < gl; i++ )
-					this.trigger( type, data, g[i] );
+		if ( !element )
+			jQuery.each( this.global[type] || [], function(){
+				jQuery.event.trigger( type, data, this );
+			});
 
 		// Handle triggering a single element
-		} else if ( element["on" + type] ) {
+		else {
+			var val, ret, fn = jQuery.isFunction( element[ type ] || null );
+			
 			// Pass along a fake event
 			data.unshift( this.fix({ type: type, target: element }) );
 
 			// Trigger the event
-			element["on" + type].apply( element, data );
+			if ( (val = this.handle.apply( element, data )) !== false )
+				this.triggered = true;
+
+			if ( fn && val !== false && !jQuery.nodeName(element, 'a') )
+				element[ type ]();
+
+			this.triggered = false;
 		}
 	},
 
 	handle: function(event) {
-		if ( typeof jQuery == "undefined" ) return false;
-
-		event = jQuery.event.fix( event || window.event || {} ); // Empty object is for triggered events with no data
-
 		// returned undefined or false
-		var returnValue;
+		var val;
+		
+		// Handle the second event of a trigger and when
+		// an event is called after a page has unloaded
+		if ( typeof jQuery == "undefined" || jQuery.event.triggered )
+		  return val;
 
-		var c = this.events[event.type];
+		// Empty object is for triggered events with no data
+		event = jQuery.event.fix( event || window.event || {} ); 
 
-		var args = [].slice.call( arguments, 1 );
+		var c = this.$events[event.type], args = [].slice.call( arguments, 1 );
 		args.unshift( event );
 
 		for ( var j in c ) {
@@ -112,14 +169,16 @@ jQuery.event = {
 			if ( c[j].apply( this, args ) === false ) {
 				event.preventDefault();
 				event.stopPropagation();
-				returnValue = false;
+				val = false;
 			}
 		}
 
 		// Clean up added properties in IE to prevent memory leak
-		if (jQuery.browser.msie) event.target = event.preventDefault = event.stopPropagation = event.handler = event.data = null;
+		if (jQuery.browser.msie)
+			event.target = event.preventDefault = event.stopPropagation =
+				event.handler = event.data = null;
 
-		return returnValue;
+		return val;
 	},
 
 	fix: function(event) {
@@ -128,32 +187,42 @@ jQuery.event = {
 			event.target = event.srcElement;
 
 		// Calculate pageX/Y if missing and clientX/Y available
-		if ( typeof event.pageX == "undefined" && typeof event.clientX != "undefined" ) {
+		if ( event.pageX == undefined && event.clientX != 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
-		if ( jQuery.browser.safari && event.target.nodeType == 3 ) {
-			// target is readonly, clone the event object
-			event = jQuery.extend({}, event);
+		// check if target is a textnode (safari)
+		if (jQuery.browser.safari && event.target.nodeType == 3) {
+			// store a copy of the original event object 
+			// and clone because target is read only
+			var originalEvent = event;
+			event = jQuery.extend({}, originalEvent);
+			
 			// get parentnode from textnode
-			event.target = event.target.parentNode;
+			event.target = originalEvent.target.parentNode;
+			
+			// add preventDefault and stopPropagation since 
+			// they will not work on the clone
+			event.preventDefault = function() {
+				return originalEvent.preventDefault();
+			};
+			event.stopPropagation = function() {
+				return originalEvent.stopPropagation();
+			};
 		}
 		
 		// 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;
 	}
@@ -169,35 +238,35 @@ jQuery.fn.extend({
 	 *
 	 * In most cases, you can define your event handlers as anonymous functions
 	 * (see first example). In cases where that is not possible, you can pass additional
-	 * data as the second paramter (and the handler function as the third), see 
+	 * data as the second parameter (and the handler function as the third), see 
 	 * second example.
 	 *
-	 * @example $("p").bind( "click", function() {
+	 * @example $("p").bind("click", function(){
 	 *   alert( $(this).text() );
-	 * } )
+	 * });
 	 * @before <p>Hello</p>
 	 * @result alert("Hello")
 	 *
-	 * @example var handler = function(event) {
+	 * @example function handler(event) {
 	 *   alert(event.data.foo);
-	 * };
-	 * $("p").bind( "click", {foo: "bar"}, handler)
+	 * }
+	 * $("p").bind("click", {foo: "bar"}, handler)
 	 * @result alert("bar")
 	 * @desc Pass some additional data to the event handler.
 	 *
-	 * @example $("form").bind( "submit", function() { return false; } )
+	 * @example $("form").bind("submit", function() { return false; })
 	 * @desc Cancel a default action and prevent it from bubbling by returning false
 	 * from your function.
 	 *
-	 * @example $("form").bind( "submit", function(event) {
+	 * @example $("form").bind("submit", function(event){
 	 *   event.preventDefault();
-	 * } );
+	 * });
 	 * @desc Cancel only the default action by using the preventDefault method.
 	 *
 	 *
-	 * @example $("form").bind( "submit", function(event) {
+	 * @example $("form").bind("submit", function(event){
 	 *   event.stopPropagation();
-	 * } )
+	 * });
 	 * @desc Stop only an event from bubbling by using the stopPropagation method.
 	 *
 	 * @name bind
@@ -209,7 +278,7 @@ jQuery.fn.extend({
 	 */
 	bind: function( type, data, fn ) {
 		return this.each(function(){
-			jQuery.event.add( this, type, fn || data, data );
+			jQuery.event.add( this, type, fn || data, fn && data );
 		});
 	},
 	
@@ -226,9 +295,9 @@ jQuery.fn.extend({
 	 * data as the second paramter (and the handler function as the third), see 
 	 * second example.
 	 *
-	 * @example $("p").one( "click", function() {
+	 * @example $("p").one("click", function(){
 	 *   alert( $(this).text() );
-	 * } )
+	 * });
 	 * @before <p>Hello</p>
 	 * @result alert("Hello")
 	 *
@@ -244,49 +313,37 @@ jQuery.fn.extend({
 			jQuery.event.add( this, type, function(event) {
 				jQuery(this).unbind(event);
 				return (fn || data).apply( this, arguments);
-			}, data);
+			}, fn && data);
 		});
 	},
 
 	/**
 	 * The opposite of bind, removes a bound event from each of the matched
-	 * elements. You must pass the identical function that was used in the original
-	 * bind method.
+	 * elements.
 	 *
-	 * @example $("p").unbind( "click", function() { alert("Hello"); } )
+	 * Without any arguments, all bound events are removed.
+	 *
+	 * If the type is provided, all bound events of that type are removed.
+	 *
+	 * If the function that was passed to bind is provided as the second argument,
+	 * only that specific event handler is removed.
+	 *
+	 * @example $("p").unbind()
 	 * @before <p onclick="alert('Hello');">Hello</p>
 	 * @result [ <p>Hello</p> ]
 	 *
-	 * @name unbind
-	 * @type jQuery
-	 * @param String type An event type
-	 * @param Function fn A function to unbind from the event on each of the set of matched elements
-	 * @cat Events
-	 */
-
-	/**
-	 * Removes all bound events of a particular type from each of the matched
-	 * elements.
-	 *
 	 * @example $("p").unbind( "click" )
 	 * @before <p onclick="alert('Hello');">Hello</p>
 	 * @result [ <p>Hello</p> ]
 	 *
-	 * @name unbind
-	 * @type jQuery
-	 * @param String type An event type
-	 * @cat Events
-	 */
-
-	/**
-	 * Removes all bound events from each of the matched elements.
-	 *
-	 * @example $("p").unbind()
+	 * @example $("p").unbind( "click", function() { alert("Hello"); } )
 	 * @before <p onclick="alert('Hello');">Hello</p>
 	 * @result [ <p>Hello</p> ]
 	 *
 	 * @name unbind
 	 * @type jQuery
+	 * @param String type (optional) An event type
+	 * @param Function fn (optional) A function to unbind from the event on each of the set of matched elements
 	 * @cat Events
 	 */
 	unbind: function( type, fn ) {
@@ -296,15 +353,35 @@ jQuery.fn.extend({
 	},
 
 	/**
-	 * Trigger a type of event on every matched element.
+	 * Trigger a type of event on every matched element. This will also cause
+	 * the default action of the browser with the same name (if one exists)
+	 * to be executed. For example, passing 'submit' to the trigger()
+	 * function will also cause the browser to submit the form. This
+	 * default action can be prevented by returning false from one of
+	 * the functions bound to the event.
+	 *
+	 * You can also trigger custom events registered with bind.
 	 *
 	 * @example $("p").trigger("click")
 	 * @before <p click="alert('hello')">Hello</p>
 	 * @result alert('hello')
 	 *
+	 * @example $("p").click(function(event, a, b) {
+	 *   // when a normal click fires, a and b are undefined
+	 *   // for a trigger like below a refers too "foo" and b refers to "bar"
+	 * }).trigger("click", ["foo", "bar"]);
+	 * @desc Example of how to pass arbitrary data to an event
+	 * 
+	 * @example $("p").bind("myEvent",function(event,message1,message2) {
+	 * 	alert(message1 + ' ' + message2);
+	 * });
+	 * $("p").trigger("myEvent",["Hello","World"]);
+	 * @result alert('Hello World') // One for each paragraph
+	 *
 	 * @name trigger
 	 * @type jQuery
 	 * @param String type An event type to trigger.
+	 * @param Array data (optional) Additional data to pass as arguments (after the event object) to the event handler
 	 * @cat Events
 	 */
 	trigger: function( type, data ) {
@@ -313,10 +390,6 @@ jQuery.fn.extend({
 		});
 	},
 
-	// We're overriding the old toggle function, so
-	// remember it for later
-	_toggle: jQuery.fn.toggle,
-	
 	/**
 	 * Toggle between two function calls every other click.
 	 * Whenever a matched element is clicked, the first specified function 
@@ -338,21 +411,19 @@ jQuery.fn.extend({
 	 * @cat Events
 	 */
 	toggle: function() {
-		// save reference to arguments for access in closure
+		// Save reference to arguments for access in closure
 		var a = arguments;
-		return typeof a[0] == "function" && typeof a[1] == "function" ? this.click(function(e) {
+
+		return this.click(function(e) {
 			// Figure out which function to execute
-			this.lastToggle = this.lastToggle == 0 ? 1 : 0;
+			this.lastToggle = 0 == this.lastToggle ? 1 : 0;
 			
 			// Make sure that clicks stop
 			e.preventDefault();
 			
 			// and execute the function
 			return a[this.lastToggle].apply( this, [e] ) || false;
-		}) :
-		
-		// Otherwise, execute the old toggle function
-		this._toggle.apply( this, arguments );
+		});
 	},
 	
 	/**
@@ -369,9 +440,9 @@ jQuery.fn.extend({
 	 * (a common error in using a mouseout event handler).
 	 *
 	 * @example $("p").hover(function(){
-	 *   $(this).addClass("over");
+	 *   $(this).addClass("hover");
 	 * },function(){
-	 *   $(this).addClass("out");
+	 *   $(this).removeClass("hover");
 	 * });
 	 *
 	 * @name hover
@@ -382,7 +453,7 @@ jQuery.fn.extend({
 	 */
 	hover: function(f,g) {
 		
-		// A private function for haandling mouse 'hovering'
+		// A private function for handling mouse 'hovering'
 		function handleHover(e) {
 			// Check if mouse(over|out) are still within the same parent element
 			var p = (e.type == "mouseover" ? e.fromElement : e.toElement) || e.relatedTarget;
@@ -408,9 +479,13 @@ jQuery.fn.extend({
 	 * the response times of your web applications.
 	 *
 	 * In a nutshell, this is a solid replacement for using window.onload, 
-	 * and attaching a function to that. By using this method, your bound Function 
+	 * and attaching a function to that. By using this method, your bound function 
 	 * will be called the instant the DOM is ready to be read and manipulated, 
-	 * which is exactly what 99.99% of all Javascript code needs to run.
+	 * which is when what 99.99% of all JavaScript code needs to run.
+	 *
+	 * There is one argument passed to the ready event handler: A reference to
+	 * the jQuery function. You can name that argument whatever you like, and
+	 * can therefore stick with the $ alias without risk of naming collisions.
 	 * 
 	 * Please ensure you have no code in your &lt;body&gt; onload event handler, 
 	 * otherwise $(document).ready() may not fire.
@@ -420,21 +495,30 @@ jQuery.fn.extend({
 	 *
 	 * @example $(document).ready(function(){ Your code here... });
 	 *
+	 * @example jQuery(function($) {
+	 *   // Your code using failsafe $ alias here...
+	 * });
+	 * @desc Uses both the [[Core#.24.28_fn_.29|shortcut]] for $(document).ready() and the argument
+	 * to write failsafe jQuery code using the $ alias, without relying on the
+	 * global alias.
+	 *
 	 * @name ready
 	 * @type jQuery
 	 * @param Function fn The function to be executed when the DOM is ready.
 	 * @cat Events
+	 * @see $.noConflict()
+	 * @see $(Function)
 	 */
 	ready: function(f) {
 		// If the DOM is already ready
 		if ( jQuery.isReady )
 			// Execute the function immediately
-			f.apply( document );
+			f.apply( document, [jQuery] );
 			
 		// Otherwise, remember the function for later
 		else {
 			// Add the function to the wait list
-			jQuery.readyList.push( f );
+			jQuery.readyList.push( function() { return f.apply(this, [jQuery]) } );
 		}
 	
 		return this;
@@ -458,8 +542,9 @@ jQuery.extend({
 			// If there are functions bound, to execute
 			if ( jQuery.readyList ) {
 				// Execute all of them
-				for ( var i = 0; i < jQuery.readyList.length; i++ )
-					jQuery.readyList[i].apply( document );
+				jQuery.each( jQuery.readyList, function(){
+					this.apply( document );
+				});
 				
 				// Reset the list of functions
 				jQuery.readyList = null;
@@ -467,590 +552,374 @@ jQuery.extend({
 			// Remove event lisenter to avoid memory leak
 			if ( jQuery.browser.mozilla || jQuery.browser.opera )
 				document.removeEventListener( "DOMContentLoaded", jQuery.ready, false );
+			
+			// Remove script element used by IE hack
+			jQuery(window).load(function(){ jQuery("#__ie_init").remove(); });
 		}
 	}
 });
 
 new function(){
 
-		/**
-		 * Bind a function to the scroll event of each matched element.
-		 *
-		 * @example $("p").scroll( function() { alert("Hello"); } );
-		 * @before <p>Hello</p>
-		 * @result <p onscroll="alert('Hello');">Hello</p>
-		 *
-		 * @name scroll
-		 * @type jQuery
-		 * @param Function fn A function to bind to the scroll event on each of the matched elements.
-		 * @cat Events/Browser
-		 */
-
-		/**
-		 * Trigger the scroll event of each matched element. This causes all of the functions
-		 * that have been bound to thet scroll event to be executed.
-		 *
-		 * @example $("p").scroll();
-		 * @before <p onscroll="alert('Hello');">Hello</p>
-		 * @result alert('Hello');
-		 *
-		 * @name scroll
-		 * @type jQuery
-		 * @cat Events/Browser
-		 */
-
-		/**
-		 * Bind a function to the submit event of each matched element.
-		 *
-		 * @example $("#myform").submit( function() {
-		 *   return $("input", this).val().length > 0;
-		 * } );
-		 * @before <form id="myform"><input /></form>
-		 * @desc Prevents the form submission when the input has no value entered.
-		 *
-		 * @name submit
-		 * @type jQuery
-		 * @param Function fn A function to bind to the submit event on each of the matched elements.
-		 * @cat Events/Form
-		 */
-
-		/**
-		 * Trigger the submit event of each matched element. This causes all of the functions
-		 * that have been bound to thet submit event to be executed.
-		 *
-		 * Note: This does not execute the submit method of the form element! If you need to
-		 * submit the form via code, you have to use the DOM method, eg. $("form")[0].submit();
-		 *
-		 * @example $("form").submit();
-		 * @desc Triggers all submit events registered for forms, but does not submit the form
-		 *
-		 * @name submit
-		 * @type jQuery
-		 * @cat Events/Form
-		 */
-
-		/**
-		 * Bind a function to the focus event of each matched element.
-		 *
-		 * @example $("p").focus( function() { alert("Hello"); } );
-		 * @before <p>Hello</p>
-		 * @result <p onfocus="alert('Hello');">Hello</p>
-		 *
-		 * @name focus
-		 * @type jQuery
-		 * @param Function fn A function to bind to the focus event on each of the matched elements.
-		 * @cat Events/UI
-		 */
-
-		/**
-		 * Trigger the focus event of each matched element. This causes all of the functions
-		 * that have been bound to thet focus event to be executed.
-		 *
-		 * Note: This does not execute the focus method of the underlying elements! If you need to
-		 * focus an element via code, you have to use the DOM method, eg. $("#myinput")[0].focus();
-		 *
-		 * @example $("p").focus();
-		 * @before <p onfocus="alert('Hello');">Hello</p>
-		 * @result alert('Hello');
-		 *
-		 * @name focus
-		 * @type jQuery
-		 * @cat Events/UI
-		 */
-
-		/**
-		 * Bind a function to the keydown event of each matched element.
-		 *
-		 * @example $("p").keydown( function() { alert("Hello"); } );
-		 * @before <p>Hello</p>
-		 * @result <p onkeydown="alert('Hello');">Hello</p>
-		 *
-		 * @name keydown
-		 * @type jQuery
-		 * @param Function fn A function to bind to the keydown event on each of the matched elements.
-		 * @cat Events/Keyboard
-		 */
-
-		/**
-		 * Trigger the keydown event of each matched element. This causes all of the functions
-		 * that have been bound to thet keydown event to be executed.
-		 *
-		 * @example $("p").keydown();
-		 * @before <p onkeydown="alert('Hello');">Hello</p>
-		 * @result alert('Hello');
-		 *
-		 * @name keydown
-		 * @type jQuery
-		 * @cat Events/Keyboard
-		 */
-
-		/**
-		 * Bind a function to the dblclick event of each matched element.
-		 *
-		 * @example $("p").dblclick( function() { alert("Hello"); } );
-		 * @before <p>Hello</p>
-		 * @result <p ondblclick="alert('Hello');">Hello</p>
-		 *
-		 * @name dblclick
-		 * @type jQuery
-		 * @param Function fn A function to bind to the dblclick event on each of the matched elements.
-		 * @cat Events/Mouse
-		 */
-
-		/**
-		 * Trigger the dblclick event of each matched element. This causes all of the functions
-		 * that have been bound to thet dblclick event to be executed.
-		 *
-		 * @example $("p").dblclick();
-		 * @before <p ondblclick="alert('Hello');">Hello</p>
-		 * @result alert('Hello');
-		 *
-		 * @name dblclick
-		 * @type jQuery
-		 * @cat Events/Mouse
-		 */
-
-		/**
-		 * Bind a function to the keypress event of each matched element.
-		 *
-		 * @example $("p").keypress( function() { alert("Hello"); } );
-		 * @before <p>Hello</p>
-		 * @result <p onkeypress="alert('Hello');">Hello</p>
-		 *
-		 * @name keypress
-		 * @type jQuery
-		 * @param Function fn A function to bind to the keypress event on each of the matched elements.
-		 * @cat Events/Keyboard
-		 */
-
-		/**
-		 * Trigger the keypress event of each matched element. This causes all of the functions
-		 * that have been bound to thet keypress event to be executed.
-		 *
-		 * @example $("p").keypress();
-		 * @before <p onkeypress="alert('Hello');">Hello</p>
-		 * @result alert('Hello');
-		 *
-		 * @name keypress
-		 * @type jQuery
-		 * @cat Events/Keyboard
-		 */
-
-		/**
-		 * Bind a function to the error event of each matched element.
-		 *
-		 * @example $("p").error( function() { alert("Hello"); } );
-		 * @before <p>Hello</p>
-		 * @result <p onerror="alert('Hello');">Hello</p>
-		 *
-		 * @name error
-		 * @type jQuery
-		 * @param Function fn A function to bind to the error event on each of the matched elements.
-		 * @cat Events/Browser
-		 */
-
-		/**
-		 * Trigger the error event of each matched element. This causes all of the functions
-		 * that have been bound to thet error event to be executed.
-		 *
-		 * @example $("p").error();
-		 * @before <p onerror="alert('Hello');">Hello</p>
-		 * @result alert('Hello');
-		 *
-		 * @name error
-		 * @type jQuery
-		 * @cat Events/Browser
-		 */
-
-		/**
-		 * Bind a function to the blur event of each matched element.
-		 *
-		 * @example $("p").blur( function() { alert("Hello"); } );
-		 * @before <p>Hello</p>
-		 * @result <p onblur="alert('Hello');">Hello</p>
-		 *
-		 * @name blur
-		 * @type jQuery
-		 * @param Function fn A function to bind to the blur event on each of the matched elements.
-		 * @cat Events/UI
-		 */
-
-		/**
-		 * Trigger the blur event of each matched element. This causes all of the functions
-		 * that have been bound to thet blur event to be executed.
-		 *
-		 * Note: This does not execute the blur method of the underlying elements! If you need to
-		 * blur an element via code, you have to use the DOM method, eg. $("#myinput")[0].blur();
-		 *
-		 * @example $("p").blur();
-		 * @before <p onblur="alert('Hello');">Hello</p>
-		 * @result alert('Hello');
-		 *
-		 * @name blur
-		 * @type jQuery
-		 * @cat Events/UI
-		 */
-
-		/**
-		 * Bind a function to the load event of each matched element.
-		 *
-		 * @example $("p").load( function() { alert("Hello"); } );
-		 * @before <p>Hello</p>
-		 * @result <p onload="alert('Hello');">Hello</p>
-		 *
-		 * @name load
-		 * @type jQuery
-		 * @param Function fn A function to bind to the load event on each of the matched elements.
-		 * @cat Events/Browser
-		 */
-
-		/**
-		 * Trigger the load event of each matched element. This causes all of the functions
-		 * that have been bound to thet load event to be executed.
-		 *
-		 * Marked as private: Calling load() without arguments throws exception because the ajax load
-		 * does not handle it.
-		 *
-		 * @example $("p").load();
-		 * @before <p onload="alert('Hello');">Hello</p>
-		 * @result alert('Hello');
-		 *
-		 * @name load
-		 * @private
-		 * @type jQuery
-		 * @cat Events/Browser
-		 */
-
-		/**
-		 * Bind a function to the select event of each matched element.
-		 *
-		 * @example $("p").select( function() { alert("Hello"); } );
-		 * @before <p>Hello</p>
-		 * @result <p onselect="alert('Hello');">Hello</p>
-		 *
-		 * @name select
-		 * @type jQuery
-		 * @param Function fn A function to bind to the select event on each of the matched elements.
-		 * @cat Events/Form
-		 */
-
-		/**
-		 * Trigger the select event of each matched element. This causes all of the functions
-		 * that have been bound to thet select event to be executed.
-		 *
-		 * @example $("p").select();
-		 * @before <p onselect="alert('Hello');">Hello</p>
-		 * @result alert('Hello');
-		 *
-		 * @name select
-		 * @type jQuery
-		 * @cat Events/Form
-		 */
-
-		/**
-		 * Bind a function to the mouseup event of each matched element.
-		 *
-		 * @example $("p").mouseup( function() { alert("Hello"); } );
-		 * @before <p>Hello</p>
-		 * @result <p onmouseup="alert('Hello');">Hello</p>
-		 *
-		 * @name mouseup
-		 * @type jQuery
-		 * @param Function fn A function to bind to the mouseup event on each of the matched elements.
-		 * @cat Events/Mouse
-		 */
-
-		/**
-		 * Trigger the mouseup event of each matched element. This causes all of the functions
-		 * that have been bound to thet mouseup event to be executed.
-		 *
-		 * @example $("p").mouseup();
-		 * @before <p onmouseup="alert('Hello');">Hello</p>
-		 * @result alert('Hello');
-		 *
-		 * @name mouseup
-		 * @type jQuery
-		 * @cat Events/Mouse
-		 */
-
-		/**
-		 * Bind a function to the unload event of each matched element.
-		 *
-		 * @example $("p").unload( function() { alert("Hello"); } );
-		 * @before <p>Hello</p>
-		 * @result <p onunload="alert('Hello');">Hello</p>
-		 *
-		 * @name unload
-		 * @type jQuery
-		 * @param Function fn A function to bind to the unload event on each of the matched elements.
-		 * @cat Events/Browser
-		 */
-
-		/**
-		 * Trigger the unload event of each matched element. This causes all of the functions
-		 * that have been bound to thet unload event to be executed.
-		 *
-		 * @example $("p").unload();
-		 * @before <p onunload="alert('Hello');">Hello</p>
-		 * @result alert('Hello');
-		 *
-		 * @name unload
-		 * @type jQuery
-		 * @cat Events/Browser
-		 */
-
-		/**
-		 * Bind a function to the change event of each matched element.
-		 *
-		 * @example $("p").change( function() { alert("Hello"); } );
-		 * @before <p>Hello</p>
-		 * @result <p onchange="alert('Hello');">Hello</p>
-		 *
-		 * @name change
-		 * @type jQuery
-		 * @param Function fn A function to bind to the change event on each of the matched elements.
-		 * @cat Events/Form
-		 */
-
-		/**
-		 * Trigger the change event of each matched element. This causes all of the functions
-		 * that have been bound to thet change event to be executed.
-		 *
-		 * @example $("p").change();
-		 * @before <p onchange="alert('Hello');">Hello</p>
-		 * @result alert('Hello');
-		 *
-		 * @name change
-		 * @type jQuery
-		 * @cat Events/Form
-		 */
-
-		/**
-		 * Bind a function to the mouseout event of each matched element.
-		 *
-		 * @example $("p").mouseout( function() { alert("Hello"); } );
-		 * @before <p>Hello</p>
-		 * @result <p onmouseout="alert('Hello');">Hello</p>
-		 *
-		 * @name mouseout
-		 * @type jQuery
-		 * @param Function fn A function to bind to the mouseout event on each of the matched elements.
-		 * @cat Events/Mouse
-		 */
-
-		/**
-		 * Trigger the mouseout event of each matched element. This causes all of the functions
-		 * that have been bound to thet mouseout event to be executed.
-		 *
-		 * @example $("p").mouseout();
-		 * @before <p onmouseout="alert('Hello');">Hello</p>
-		 * @result alert('Hello');
-		 *
-		 * @name mouseout
-		 * @type jQuery
-		 * @cat Events/Mouse
-		 */
-
-		/**
-		 * Bind a function to the keyup event of each matched element.
-		 *
-		 * @example $("p").keyup( function() { alert("Hello"); } );
-		 * @before <p>Hello</p>
-		 * @result <p onkeyup="alert('Hello');">Hello</p>
-		 *
-		 * @name keyup
-		 * @type jQuery
-		 * @param Function fn A function to bind to the keyup event on each of the matched elements.
-		 * @cat Events/Keyboard
-		 */
-
-		/**
-		 * Trigger the keyup event of each matched element. This causes all of the functions
-		 * that have been bound to thet keyup event to be executed.
-		 *
-		 * @example $("p").keyup();
-		 * @before <p onkeyup="alert('Hello');">Hello</p>
-		 * @result alert('Hello');
-		 *
-		 * @name keyup
-		 * @type jQuery
-		 * @cat Events/Keyboard
-		 */
-
-		/**
-		 * Bind a function to the click event of each matched element.
-		 *
-		 * @example $("p").click( function() { alert("Hello"); } );
-		 * @before <p>Hello</p>
-		 * @result <p onclick="alert('Hello');">Hello</p>
-		 *
-		 * @name click
-		 * @type jQuery
-		 * @param Function fn A function to bind to the click event on each of the matched elements.
-		 * @cat Events/Mouse
-		 */
-
-		/**
-		 * Trigger the click event of each matched element. This causes all of the functions
-		 * that have been bound to thet click event to be executed.
-		 *
-		 * @example $("p").click();
-		 * @before <p onclick="alert('Hello');">Hello</p>
-		 * @result alert('Hello');
-		 *
-		 * @name click
-		 * @type jQuery
-		 * @cat Events/Mouse
-		 */
-
-		/**
-		 * Bind a function to the resize event of each matched element.
-		 *
-		 * @example $("p").resize( function() { alert("Hello"); } );
-		 * @before <p>Hello</p>
-		 * @result <p onresize="alert('Hello');">Hello</p>
-		 *
-		 * @name resize
-		 * @type jQuery
-		 * @param Function fn A function to bind to the resize event on each of the matched elements.
-		 * @cat Events/Browser
-		 */
-
-		/**
-		 * Trigger the resize event of each matched element. This causes all of the functions
-		 * that have been bound to thet resize event to be executed.
-		 *
-		 * @example $("p").resize();
-		 * @before <p onresize="alert('Hello');">Hello</p>
-		 * @result alert('Hello');
-		 *
-		 * @name resize
-		 * @type jQuery
-		 * @cat Events/Browser
-		 */
-
-		/**
-		 * Bind a function to the mousemove event of each matched element.
-		 *
-		 * @example $("p").mousemove( function() { alert("Hello"); } );
-		 * @before <p>Hello</p>
-		 * @result <p onmousemove="alert('Hello');">Hello</p>
-		 *
-		 * @name mousemove
-		 * @type jQuery
-		 * @param Function fn A function to bind to the mousemove event on each of the matched elements.
-		 * @cat Events/Mouse
-		 */
-
-		/**
-		 * Trigger the mousemove event of each matched element. This causes all of the functions
-		 * that have been bound to thet mousemove event to be executed.
-		 *
-		 * @example $("p").mousemove();
-		 * @before <p onmousemove="alert('Hello');">Hello</p>
-		 * @result alert('Hello');
-		 *
-		 * @name mousemove
-		 * @type jQuery
-		 * @cat Events/Mouse
-		 */
-
-		/**
-		 * Bind a function to the mousedown event of each matched element.
-		 *
-		 * @example $("p").mousedown( function() { alert("Hello"); } );
-		 * @before <p>Hello</p>
-		 * @result <p onmousedown="alert('Hello');">Hello</p>
-		 *
-		 * @name mousedown
-		 * @type jQuery
-		 * @param Function fn A function to bind to the mousedown event on each of the matched elements.
-		 * @cat Events/Mouse
-		 */
-
-		/**
-		 * Trigger the mousedown event of each matched element. This causes all of the functions
-		 * that have been bound to thet mousedown event to be executed.
-		 *
-		 * @example $("p").mousedown();
-		 * @before <p onmousedown="alert('Hello');">Hello</p>
-		 * @result alert('Hello');
-		 *
-		 * @name mousedown
-		 * @type jQuery
-		 * @cat Events/Mouse
-		 */
-		 
-		/**
-		 * Bind a function to the mouseover event of each matched element.
-		 *
-		 * @example $("p").mouseover( function() { alert("Hello"); } );
-		 * @before <p>Hello</p>
-		 * @result <p onmouseover="alert('Hello');">Hello</p>
-		 *
-		 * @name mouseover
-		 * @type jQuery
-		 * @param Function fn A function to bind to the mousedown event on each of the matched elements.
-		 * @cat Events/Mouse
-		 */
-
-		/**
-		 * Trigger the mouseover event of each matched element. This causes all of the functions
-		 * that have been bound to thet mousedown event to be executed.
-		 *
-		 * @example $("p").mouseover();
-		 * @before <p onmouseover="alert('Hello');">Hello</p>
-		 * @result alert('Hello');
-		 *
-		 * @name mouseover
-		 * @type jQuery
-		 * @cat Events/Mouse
-		 */
-
-	var e = ("blur,focus,load,resize,scroll,unload,click,dblclick," +
-		"mousedown,mouseup,mousemove,mouseover,mouseout,change,select," + 
-		"submit,keydown,keypress,keyup,error").split(",");
+	/**
+	 * Bind a function to the scroll event of each matched element.
+	 *
+	 * @example $("p").scroll( function() { alert("Hello"); } );
+	 * @before <p>Hello</p>
+	 * @result <p onscroll="alert('Hello');">Hello</p>
+	 *
+	 * @name scroll
+	 * @type jQuery
+	 * @param Function fn A function to bind to the scroll event on each of the matched elements.
+	 * @cat Events
+	 */
 
-	// Go through all the event names, but make sure that
-	// it is enclosed properly
-	for ( var i = 0; i < e.length; i++ ) new function(){
-			
-		var o = e[i];
+	/**
+	 * Bind a function to the submit event of each matched element.
+	 *
+	 * @example $("#myform").submit( function() {
+	 *   return $("input", this).val().length > 0;
+	 * } );
+	 * @before <form id="myform"><input /></form>
+	 * @desc Prevents the form submission when the input has no value entered.
+	 *
+	 * @name submit
+	 * @type jQuery
+	 * @param Function fn A function to bind to the submit event on each of the matched elements.
+	 * @cat Events
+	 */
+
+	/**
+	 * Trigger the submit event of each matched element. This causes all of the functions
+	 * that have been bound to that submit event to be executed, and calls the browser's
+	 * default submit action on the matching element(s). This default action can be prevented
+	 * by returning false from one of the functions bound to the submit event.
+	 *
+	 * Note: This does not execute the submit method of the form element! If you need to
+	 * submit the form via code, you have to use the DOM method, eg. $("form")[0].submit();
+	 *
+	 * @example $("form").submit();
+	 * @desc Triggers all submit events registered to the matched form(s), and submits them.
+	 *
+	 * @name submit
+	 * @type jQuery
+	 * @cat Events
+	 */
+
+	/**
+	 * Bind a function to the focus event of each matched element.
+	 *
+	 * @example $("p").focus( function() { alert("Hello"); } );
+	 * @before <p>Hello</p>
+	 * @result <p onfocus="alert('Hello');">Hello</p>
+	 *
+	 * @name focus
+	 * @type jQuery
+	 * @param Function fn A function to bind to the focus event on each of the matched elements.
+	 * @cat Events
+	 */
+
+	/**
+	 * Trigger the focus event of each matched element. This causes all of the functions
+	 * that have been bound to thet focus event to be executed.
+	 *
+	 * Note: This does not execute the focus method of the underlying elements! If you need to
+	 * focus an element via code, you have to use the DOM method, eg. $("#myinput")[0].focus();
+	 *
+	 * @example $("p").focus();
+	 * @before <p onfocus="alert('Hello');">Hello</p>
+	 * @result alert('Hello');
+	 *
+	 * @name focus
+	 * @type jQuery
+	 * @cat Events
+	 */
+
+	/**
+	 * Bind a function to the keydown event of each matched element.
+	 *
+	 * @example $("p").keydown( function() { alert("Hello"); } );
+	 * @before <p>Hello</p>
+	 * @result <p onkeydown="alert('Hello');">Hello</p>
+	 *
+	 * @name keydown
+	 * @type jQuery
+	 * @param Function fn A function to bind to the keydown event on each of the matched elements.
+	 * @cat Events
+	 */
+
+	/**
+	 * Bind a function to the dblclick event of each matched element.
+	 *
+	 * @example $("p").dblclick( function() { alert("Hello"); } );
+	 * @before <p>Hello</p>
+	 * @result <p ondblclick="alert('Hello');">Hello</p>
+	 *
+	 * @name dblclick
+	 * @type jQuery
+	 * @param Function fn A function to bind to the dblclick event on each of the matched elements.
+	 * @cat Events
+	 */
+
+	/**
+	 * Bind a function to the keypress event of each matched element.
+	 *
+	 * @example $("p").keypress( function() { alert("Hello"); } );
+	 * @before <p>Hello</p>
+	 * @result <p onkeypress="alert('Hello');">Hello</p>
+	 *
+	 * @name keypress
+	 * @type jQuery
+	 * @param Function fn A function to bind to the keypress event on each of the matched elements.
+	 * @cat Events
+	 */
+
+	/**
+	 * Bind a function to the error event of each matched element.
+	 *
+	 * @example $("p").error( function() { alert("Hello"); } );
+	 * @before <p>Hello</p>
+	 * @result <p onerror="alert('Hello');">Hello</p>
+	 *
+	 * @name error
+	 * @type jQuery
+	 * @param Function fn A function to bind to the error event on each of the matched elements.
+	 * @cat Events
+	 */
+
+	/**
+	 * Bind a function to the blur event of each matched element.
+	 *
+	 * @example $("p").blur( function() { alert("Hello"); } );
+	 * @before <p>Hello</p>
+	 * @result <p onblur="alert('Hello');">Hello</p>
+	 *
+	 * @name blur
+	 * @type jQuery
+	 * @param Function fn A function to bind to the blur event on each of the matched elements.
+	 * @cat Events
+	 */
+
+	/**
+	 * Trigger the blur event of each matched element. This causes all of the functions
+	 * that have been bound to that blur event to be executed, and calls the browser's
+	 * default blur action on the matching element(s). This default action can be prevented
+	 * by returning false from one of the functions bound to the blur event.
+	 *
+	 * Note: This does not execute the blur method of the underlying elements! If you need to
+	 * blur an element via code, you have to use the DOM method, eg. $("#myinput")[0].blur();
+	 *
+	 * @example $("p").blur();
+	 * @before <p onblur="alert('Hello');">Hello</p>
+	 * @result alert('Hello');
+	 *
+	 * @name blur
+	 * @type jQuery
+	 * @cat Events
+	 */
+
+	/**
+	 * Bind a function to the load event of each matched element.
+	 *
+	 * @example $("p").load( function() { alert("Hello"); } );
+	 * @before <p>Hello</p>
+	 * @result <p onload="alert('Hello');">Hello</p>
+	 *
+	 * @name load
+	 * @type jQuery
+	 * @param Function fn A function to bind to the load event on each of the matched elements.
+	 * @cat Events
+	 */
+
+	/**
+	 * Bind a function to the select event of each matched element.
+	 *
+	 * @example $("p").select( function() { alert("Hello"); } );
+	 * @before <p>Hello</p>
+	 * @result <p onselect="alert('Hello');">Hello</p>
+	 *
+	 * @name select
+	 * @type jQuery
+	 * @param Function fn A function to bind to the select event on each of the matched elements.
+	 * @cat Events
+	 */
+
+	/**
+	 * Trigger the select event of each matched element. This causes all of the functions
+	 * that have been bound to that select event to be executed, and calls the browser's
+	 * default select action on the matching element(s). This default action can be prevented
+	 * by returning false from one of the functions bound to the select event.
+	 *
+	 * @example $("p").select();
+	 * @before <p onselect="alert('Hello');">Hello</p>
+	 * @result alert('Hello');
+	 *
+	 * @name select
+	 * @type jQuery
+	 * @cat Events
+	 */
+
+	/**
+	 * Bind a function to the mouseup event of each matched element.
+	 *
+	 * @example $("p").mouseup( function() { alert("Hello"); } );
+	 * @before <p>Hello</p>
+	 * @result <p onmouseup="alert('Hello');">Hello</p>
+	 *
+	 * @name mouseup
+	 * @type jQuery
+	 * @param Function fn A function to bind to the mouseup event on each of the matched elements.
+	 * @cat Events
+	 */
+
+	/**
+	 * Bind a function to the unload event of each matched element.
+	 *
+	 * @example $("p").unload( function() { alert("Hello"); } );
+	 * @before <p>Hello</p>
+	 * @result <p onunload="alert('Hello');">Hello</p>
+	 *
+	 * @name unload
+	 * @type jQuery
+	 * @param Function fn A function to bind to the unload event on each of the matched elements.
+	 * @cat Events
+	 */
+
+	/**
+	 * Bind a function to the change event of each matched element.
+	 *
+	 * @example $("p").change( function() { alert("Hello"); } );
+	 * @before <p>Hello</p>
+	 * @result <p onchange="alert('Hello');">Hello</p>
+	 *
+	 * @name change
+	 * @type jQuery
+	 * @param Function fn A function to bind to the change event on each of the matched elements.
+	 * @cat Events
+	 */
+
+	/**
+	 * Bind a function to the mouseout event of each matched element.
+	 *
+	 * @example $("p").mouseout( function() { alert("Hello"); } );
+	 * @before <p>Hello</p>
+	 * @result <p onmouseout="alert('Hello');">Hello</p>
+	 *
+	 * @name mouseout
+	 * @type jQuery
+	 * @param Function fn A function to bind to the mouseout event on each of the matched elements.
+	 * @cat Events
+	 */
+
+	/**
+	 * Bind a function to the keyup event of each matched element.
+	 *
+	 * @example $("p").keyup( function() { alert("Hello"); } );
+	 * @before <p>Hello</p>
+	 * @result <p onkeyup="alert('Hello');">Hello</p>
+	 *
+	 * @name keyup
+	 * @type jQuery
+	 * @param Function fn A function to bind to the keyup event on each of the matched elements.
+	 * @cat Events
+	 */
+
+	/**
+	 * Bind a function to the click event of each matched element.
+	 *
+	 * @example $("p").click( function() { alert("Hello"); } );
+	 * @before <p>Hello</p>
+	 * @result <p onclick="alert('Hello');">Hello</p>
+	 *
+	 * @name click
+	 * @type jQuery
+	 * @param Function fn A function to bind to the click event on each of the matched elements.
+	 * @cat Events
+	 */
+
+	/**
+	 * Trigger the click event of each matched element. This causes all of the functions
+	 * that have been bound to thet click event to be executed.
+	 *
+	 * @example $("p").click();
+	 * @before <p onclick="alert('Hello');">Hello</p>
+	 * @result alert('Hello');
+	 *
+	 * @name click
+	 * @type jQuery
+	 * @cat Events
+	 */
+
+	/**
+	 * Bind a function to the resize event of each matched element.
+	 *
+	 * @example $("p").resize( function() { alert("Hello"); } );
+	 * @before <p>Hello</p>
+	 * @result <p onresize="alert('Hello');">Hello</p>
+	 *
+	 * @name resize
+	 * @type jQuery
+	 * @param Function fn A function to bind to the resize event on each of the matched elements.
+	 * @cat Events
+	 */
+
+	/**
+	 * Bind a function to the mousemove event of each matched element.
+	 *
+	 * @example $("p").mousemove( function() { alert("Hello"); } );
+	 * @before <p>Hello</p>
+	 * @result <p onmousemove="alert('Hello');">Hello</p>
+	 *
+	 * @name mousemove
+	 * @type jQuery
+	 * @param Function fn A function to bind to the mousemove event on each of the matched elements.
+	 * @cat Events
+	 */
+
+	/**
+	 * Bind a function to the mousedown event of each matched element.
+	 *
+	 * @example $("p").mousedown( function() { alert("Hello"); } );
+	 * @before <p>Hello</p>
+	 * @result <p onmousedown="alert('Hello');">Hello</p>
+	 *
+	 * @name mousedown
+	 * @type jQuery
+	 * @param Function fn A function to bind to the mousedown event on each of the matched elements.
+	 * @cat Events
+	 */
+	 
+	/**
+	 * Bind a function to the mouseover event of each matched element.
+	 *
+	 * @example $("p").mouseover( function() { alert("Hello"); } );
+	 * @before <p>Hello</p>
+	 * @result <p onmouseover="alert('Hello');">Hello</p>
+	 *
+	 * @name mouseover
+	 * @type jQuery
+	 * @param Function fn A function to bind to the mousedown event on each of the matched elements.
+	 * @cat Events
+	 */
+	jQuery.each( ("blur,focus,load,resize,scroll,unload,click,dblclick," +
+		"mousedown,mouseup,mousemove,mouseover,mouseout,change,select," + 
+		"submit,keydown,keypress,keyup,error").split(","), function(i,o){
 		
 		// Handle event binding
 		jQuery.fn[o] = function(f){
 			return f ? this.bind(o, f) : this.trigger(o);
 		};
-		
-		// Handle event unbinding
-		// TODO remove
-		jQuery.fn["un"+o] = function(f){ return this.unbind(o, f); };
-		
-		// Finally, handle events that only fire once
-		// TODO remove
-		jQuery.fn["one"+o] = function(f){
-			// save cloned reference to this
-			var element = jQuery(this);
-			var handler = function() {
-				// unbind itself when executed
-				element.unbind(o, handler);
-				element = null;
-				// apply original handler with the same arguments
-				return f.apply(this, arguments);
-			};
-			return this.bind(o, handler);
-		};
 			
-	};
+	});
 	
 	// If Mozilla is used
-	if ( jQuery.browser.mozilla || jQuery.browser.opera ) {
+	if ( jQuery.browser.mozilla || jQuery.browser.opera )
 		// Use the handy event callback
 		document.addEventListener( "DOMContentLoaded", jQuery.ready, false );
 	
 	// If IE is used, use the excellent hack by Matthias Miller
 	// http://www.outofhanwell.com/blog/index.php?title=the_window_onload_problem_revisited
-	} else if ( jQuery.browser.msie ) {
+	else if ( jQuery.browser.msie ) {
 	
 		// Only works if you document.write() it
 		document.write("<scr" + "ipt id=__ie_init defer=true " + 
@@ -1058,10 +927,11 @@ new function(){
 	
 		// Use the defer script hack
 		var script = document.getElementById("__ie_init");
-		if (script) // script does not exist if jQuery is loaded dynamically
+		
+		// script does not exist if jQuery is loaded dynamically
+		if ( script ) 
 			script.onreadystatechange = function() {
 				if ( this.readyState != "complete" ) return;
-				this.parentNode.removeChild( this );
 				jQuery.ready();
 			};
 	
@@ -1069,7 +939,7 @@ new function(){
 		script = null;
 	
 	// If Safari  is used
-	} else if ( jQuery.browser.safari ) {
+	} else if ( jQuery.browser.safari )
 		// Continually check to see if the document.readyState is valid
 		jQuery.safariTimer = setInterval(function(){
 			// loaded and complete are both valid states
@@ -1083,8 +953,7 @@ new function(){
 				// and execute any waiting functions
 				jQuery.ready();
 			}
-		}, 10);
-	} 
+		}, 10); 
 
 	// A fallback to window.onload, that will always work
 	jQuery.event.add( window, "load", jQuery.ready );
@@ -1092,10 +961,14 @@ new function(){
 };
 
 // Clean up after IE to avoid memory leaks
-if (jQuery.browser.msie) jQuery(window).unload(function() {
-	var event = jQuery.event, global = event.global;
-	for (var type in global) {
- 		var els = global[type], i = els.length;
-		if (i>0) do if (type != 'unload') event.remove(els[i-1], type); while (--i);
-	}
-});
+if (jQuery.browser.msie)
+	jQuery(window).one("unload", function() {
+		var global = jQuery.event.global;
+		for ( var type in global ) {
+			var els = global[type], i = els.length;
+			if ( i && type != 'unload' )
+				do
+					jQuery.event.remove(els[i-1], type);
+				while (--i);
+		}
+	});