X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fevent%2Fevent.js;h=e7f920f9b885c207a1cf2d16e16178da56cc1508;hb=b93051f5af385ffca32df2333b1ca761cb56863f;hp=9b5d46ea3edc4f95f331169ba10e076011fe47a7;hpb=c6e6e72561979ab80aaf5ce1ab63d3dd010382a3;p=jquery.git

diff --git a/src/event/event.js b/src/event/event.js
index 9b5d46e..e7f920f 100644
--- a/src/event/event.js
+++ b/src/event/event.js
@@ -22,16 +22,16 @@ jQuery.event = {
 			handler.guid = this.guid++;
 
 		// Init the element's event structure
-		if (!element.events)
-			element.events = {};
+		if (!element.$events)
+			element.$events = {};
 
 		// 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
 		if (!handlers) {
 			// Init the event handler queue
-			handlers = element.events[type] = {};
+			handlers = element.$events[type] = {};
 
 			// Remember an existing handler, if it's already there
 			if (element["on" + type])
@@ -55,47 +55,55 @@ jQuery.event = {
 
 	// Detach an event or set of events from an element
 	remove: function(element, type, handler) {
-		if (element.events)
+		if (element.$events)
 			if ( type && type.type )
-				delete element.events[ type.type ][ type.handler.guid ];
-			else if (type && element.events[type])
+				delete element.$events[ type.type ][ type.handler.guid ];
+			else if (type && element.$events[type])
 				if ( handler )
-					delete element.events[type][handler.guid];
+					delete element.$events[type][handler.guid];
 				else
-					for ( var i in element.events[type] )
-						delete element.events[type][i];
+					for ( var i in element.$events[type] )
+						delete element.$events[type][i];
 			else
-				for ( var j in element.events )
+				for ( var j in element.$events )
 					this.remove( element, j );
 	},
 
-	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] ) {
-			if ( element[ type ] && element[ type ].constructor == Function )
-				element[ type ]();
-			else {
+		else {
+			var handler = element["on" + type ], val,
+				fn = jQuery.isFunction( element[ type ] );
+
+			if ( handler ) {
 				// Pass along a fake event
 				data.unshift( this.fix({ type: type, target: element }) );
 	
 				// Trigger the event
-				element["on" + type].apply( element, data );
+				if ( (val = handler.apply( element, data )) !== false )
+					this.triggered = true;
 			}
+
+			if ( fn && val !== false )
+				element[ type ]();
+
+			this.triggered = false;
 		}
 	},
 
 	handle: function(event) {
-		if ( typeof jQuery == "undefined" ) return false;
+		// 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;
 
 		// Empty object is for triggered events with no data
 		event = jQuery.event.fix( event || window.event || {} ); 
@@ -103,7 +111,7 @@ jQuery.event = {
 		// returned undefined or false
 		var returnValue;
 
-		var c = this.events[event.type];
+		var c = this.$events[event.type];
 
 		var args = [].slice.call( arguments, 1 );
 		args.unshift( event );
@@ -133,7 +141,7 @@ 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);
@@ -305,9 +313,19 @@ jQuery.fn.extend({
 	 * @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 to an event
+	 * 
+	 * @before <p click="alert('hello')">Hello</p>
+	 * @result alert('hello')
+	 *
 	 * @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 ) {
@@ -411,7 +429,7 @@ jQuery.fn.extend({
 	 *
 	 * 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 risc of naming collisions.
+	 * 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.
@@ -468,8 +486,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;