X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fevent%2Fevent.js;h=6e8a45f81a24069055a86c8267215893b6f353ac;hb=d7b73ea5c7440c49c804b3cafe67e84aafbdd064;hp=b8c856b9b45694945ead0a0162ed95cea81c2f53;hpb=09bfb5df0dd385bdf1f6b8bca7c29d3fd98b87c5;p=jquery.git

diff --git a/src/event/event.js b/src/event/event.js
index b8c856b..6e8a45f 100644
--- a/src/event/event.js
+++ b/src/event/event.js
@@ -1,5 +1,321 @@
+/*
+ * A number of helper functions used for managing events.
+ * Many of the ideas behind this code orignated from 
+ * Dean Edwards' addEvent library.
+ */
+jQuery.event = {
+
+	// Bind an event to an element
+	// Original by Dean Edwards
+	add: function(element, type, handler, data) {
+		// For whatever reason, IE has trouble passing the window object
+		// 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 ) 
+			handler.data = data;
+
+		// Make sure that the function being executed has a unique ID
+		if ( !handler.guid )
+			handler.guid = this.guid++;
+
+		// Init the element's event structure
+		if (!element.events)
+			element.events = {};
+
+		// Get the current list of functions bound to this event
+		var handlers = element.events[type];
+
+		// If it hasn't been initialized yet
+		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];
+		}
+
+		// 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] = [];
+		this.global[type].push( element );
+	},
+
+	guid: 1,
+	global: {},
+
+	// 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])
+				if ( handler )
+					delete element.events[type][handler.guid];
+				else
+					for ( var i in element.events[type] )
+						delete element.events[type][i];
+			else
+				for ( var j in element.events )
+					this.remove( element, j );
+	},
+
+	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] );
+
+		// Handle triggering a single element
+		} else if ( element["on" + type] ) {
+			if ( element[ type ] && element[ type ].constructor == Function )
+				element[ type ]();
+			else {
+				// Pass along a fake event
+				data.unshift( this.fix({ type: type, target: element }) );
+	
+				// Trigger the event
+				element["on" + type].apply( element, data );
+			}
+		}
+	},
+
+	handle: function(event) {
+		if ( typeof jQuery == "undefined" ) return false;
+
+		// Empty object is for triggered events with no data
+		event = jQuery.event.fix( event || window.event || {} ); 
+
+		// returned undefined or false
+		var returnValue;
+
+		var c = this.events[event.type];
+
+		var args = [].slice.call( arguments, 1 );
+		args.unshift( event );
+
+		for ( var j in c ) {
+			// Pass in a reference to the handler function itself
+			// So that we can later remove it
+			args[0].handler = c[j];
+			args[0].data = c[j].data;
+
+			if ( c[j].apply( this, args ) === false ) {
+				event.preventDefault();
+				event.stopPropagation();
+				returnValue = 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;
+
+		return returnValue;
+	},
+
+	fix: function(event) {
+		// Fix target property, if necessary
+		if ( !event.target && event.srcElement )
+			event.target = event.srcElement;
+
+		// Calculate pageX/Y if missing and clientX/Y available
+		if ( typeof event.pageX == "undefined" && typeof 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 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 = 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)
+			event.preventDefault = function() {
+				this.returnValue = false;
+			};
+			
+		if (!event.stopPropagation)
+			event.stopPropagation = function() {
+				this.cancelBubble = true;
+			};
+			
+		return event;
+	}
+};
+
 jQuery.fn.extend({
 
+	/**
+	 * Binds a handler to a particular event (like click) for each matched element.
+	 * The event handler is passed an event object that you can use to prevent
+	 * default behaviour. To stop both default action and event bubbling, your handler
+	 * has to return false.
+	 *
+	 * 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 
+	 * second example.
+	 *
+	 * @example $("p").bind( "click", function() {
+	 *   alert( $(this).text() );
+	 * } )
+	 * @before <p>Hello</p>
+	 * @result alert("Hello")
+	 *
+	 * @example var handler = function(event) {
+	 *   alert(event.data.foo);
+	 * };
+	 * $("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; } )
+	 * @desc Cancel a default action and prevent it from bubbling by returning false
+	 * from your function.
+	 *
+	 * @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) {
+	 *   event.stopPropagation();
+	 * } )
+	 * @desc Stop only an event from bubbling by using the stopPropagation method.
+	 *
+	 * @name bind
+	 * @type jQuery
+	 * @param String type An event type
+	 * @param Object data (optional) Additional data passed to the event handler as event.data
+	 * @param Function fn A function to bind to the event on each of the set of matched elements
+	 * @cat Events
+	 */
+	bind: function( type, data, fn ) {
+		return this.each(function(){
+			jQuery.event.add( this, type, fn || data, data );
+		});
+	},
+	
+	/**
+	 * Binds a handler to a particular event (like click) for each matched element.
+	 * The handler is executed only once for each element. Otherwise, the same rules
+	 * as described in bind() apply.
+	 The event handler is passed an event object that you can use to prevent
+	 * default behaviour. To stop both default action and event bubbling, your handler
+	 * has to return false.
+	 *
+	 * 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 
+	 * second example.
+	 *
+	 * @example $("p").one( "click", function() {
+	 *   alert( $(this).text() );
+	 * } )
+	 * @before <p>Hello</p>
+	 * @result alert("Hello")
+	 *
+	 * @name one
+	 * @type jQuery
+	 * @param String type An event type
+	 * @param Object data (optional) Additional data passed to the event handler as event.data
+	 * @param Function fn A function to bind to the event on each of the set of matched elements
+	 * @cat Events
+	 */
+	one: function( type, data, fn ) {
+		return this.each(function(){
+			jQuery.event.add( this, type, function(event) {
+				jQuery(this).unbind(event);
+				return (fn || data).apply( this, arguments);
+			}, data);
+		});
+	},
+
+	/**
+	 * The opposite of bind, removes a bound event from each of the matched
+	 * elements.
+	 *
+	 * 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> ]
+	 *
+	 * @example $("p").unbind( "click" )
+	 * @before <p onclick="alert('Hello');">Hello</p>
+	 * @result [ <p>Hello</p> ]
+	 *
+	 * @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 ) {
+		return this.each(function(){
+			jQuery.event.remove( this, type, fn );
+		});
+	},
+
+	/**
+	 * Trigger a type of event on every matched element.
+	 *
+	 * @example $("p").trigger("click")
+	 * @before <p click="alert('hello')">Hello</p>
+	 * @result alert('hello')
+	 *
+	 * @name trigger
+	 * @type jQuery
+	 * @param String type An event type to trigger.
+	 * @cat Events
+	 */
+	trigger: function( type, data ) {
+		return this.each(function(){
+			jQuery.event.trigger( type, data, this );
+		});
+	},
+
 	// We're overriding the old toggle function, so
 	// remember it for later
 	_toggle: jQuery.fn.toggle,
@@ -69,7 +385,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;
@@ -160,584 +476,359 @@ jQuery.extend({
 
 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 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
+	 */
+
+	/**
+	 * 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 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
+	 */
+
+	/**
+	 * 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 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
+	 */
+
+	/**
+	 * 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 " + 
@@ -745,7 +836,9 @@ 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 );
@@ -756,7 +849,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
@@ -770,8 +863,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 );
@@ -779,10 +871,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);
+		}
+	});
\ No newline at end of file