X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fevent%2Fevent.js;h=3b3294ba203dfab23fabf71b8e532c1f0ac86c06;hb=fbd2b066a71c8c2371e11f7f6b201a9000b564e4;hp=bb5f9d273dc345f3e2ac9451e15829178ab1bec1;hpb=2ef4093cf7f52383dd43bd361864edcda27e5c3c;p=jquery.git

diff --git a/src/event/event.js b/src/event/event.js
index bb5f9d2..3b3294b 100644
--- a/src/event/event.js
+++ b/src/event/event.js
@@ -122,7 +122,7 @@ jQuery.event = {
 		}
 	},
 
-	trigger: function(type, data, element) {
+	trigger: function(type, data, element, native, extra) {
 		// Clone the incoming data, if any
 		data = jQuery.makeArray(data || []);
 
@@ -130,28 +130,44 @@ jQuery.event = {
 		if ( !element ) {
 			// Only trigger if we've ever bound an event for it
 			if ( this.global[type] )
-				jQuery("*").trigger(type, data);
+				jQuery("*").add([window, document]).trigger(type, data);
 
 		// Handle triggering a single element
 		} else {
-			var val, ret, fn = jQuery.isFunction( element[ type ] || null );
+			var val, ret, fn = jQuery.isFunction( element[ type ] || null ),
+				// Check to see if we need to provide a fake event, or not
+				evt = !data[0] || !data[0].preventDefault;
 			
 			// Pass along a fake event
-			data.unshift( this.fix({ type: type, target: element }) );
+			if ( evt )
+				data.unshift( this.fix({ type: type, target: element }) );
 
 			// Trigger the event
 			if ( jQuery.isFunction( element.$handle ) )
 				val = element.$handle.apply( element, data );
+
+			// Handle triggering native .onfoo handlers
 			if ( !fn && element["on"+type] && element["on"+type].apply( element, data ) === false )
 				val = false;
 
-			if ( fn && val !== false && !(jQuery.nodeName(element, 'a') && type == "click") ) {
+			// Extra functions don't get the custom event object
+			if ( evt )
+				data.shift();
+
+			// Handle triggering of extra function
+			if ( extra && extra.apply( element, data ) === false )
+				val = false;
+
+			// Trigger the native events (except for clicks on links)
+			if ( fn && native !== false && val !== false && !(jQuery.nodeName(element, 'a') && type == "click") ) {
 				this.triggered = true;
 				element[ type ]();
 			}
 
 			this.triggered = false;
 		}
+
+		return val;
 	},
 
 	handle: function(event) {
@@ -161,7 +177,7 @@ jQuery.event = {
 		// Empty object is for triggered events with no data
 		event = jQuery.event.fix( event || window.event || {} ); 
 
-		var c = this.$events && this.$events[event.type], args = [].slice.call( arguments, 1 );
+		var c = this.$events && this.$events[event.type], args = Array.prototype.slice.call( arguments, 1 );
 		args.unshift( event );
 
 		for ( var j in c ) {
@@ -170,10 +186,14 @@ jQuery.event = {
 			args[0].handler = c[j];
 			args[0].data = c[j].data;
 
-			if ( c[j].apply( this, args ) === false ) {
+			var tmp = c[j].apply( this, args );
+
+			if ( val !== false )
+				val = tmp;
+
+			if ( tmp === false ) {
 				event.preventDefault();
 				event.stopPropagation();
-				val = false;
 			}
 		}
 
@@ -196,14 +216,14 @@ jQuery.event = {
 		event.preventDefault = function() {
 			// if preventDefault exists run it on the original event
 			if (originalEvent.preventDefault)
-				return originalEvent.preventDefault();
+				originalEvent.preventDefault();
 			// otherwise set the returnValue property of the original event to false (IE)
 			originalEvent.returnValue = false;
 		};
 		event.stopPropagation = function() {
 			// if stopPropagation exists run it on the original event
 			if (originalEvent.stopPropagation)
-				return originalEvent.stopPropagation();
+				originalEvent.stopPropagation();
 			// otherwise set the cancelBubble property of the original event to true (IE)
 			originalEvent.cancelBubble = true;
 		};
@@ -403,12 +423,17 @@ jQuery.fn.extend({
 	 * @param Array data (optional) Additional data to pass as arguments (after the event object) to the event handler
 	 * @cat Events
 	 */
-	trigger: function( type, data ) {
+	trigger: function( type, data, fn ) {
 		return this.each(function(){
-			jQuery.event.trigger( type, data, this );
+			jQuery.event.trigger( type, data, this, true, fn );
 		});
 	},
 
+	triggerHandler: function( type, data, fn ) {
+		if ( this[0] )
+			return jQuery.event.trigger( type, data, this[0], false, fn );
+	},
+
 	/**
 	 * Toggle between two function calls every other click.
 	 * Whenever a matched element is clicked, the first specified function 
@@ -529,6 +554,9 @@ jQuery.fn.extend({
 	 * @see $(Function)
 	 */
 	ready: function(f) {
+		// Attach the listeners
+		bindReady();
+
 		// If the DOM is already ready
 		if ( jQuery.isReady )
 			// Execute the function immediately
@@ -578,8 +606,6 @@ jQuery.extend({
 	}
 });
 
-new function(){
-
 	/**
 	 * Bind a function to the scroll event of each matched element.
 	 *
@@ -930,7 +956,13 @@ new function(){
 		};
 			
 	});
-	
+
+var readyBound = false;
+
+function bindReady(){
+	if ( readyBound ) return;
+	readyBound = true;
+
 	// If Mozilla is used
 	if ( jQuery.browser.mozilla || jQuery.browser.opera )
 		// Use the handy event callback
@@ -976,5 +1008,4 @@ new function(){
 
 	// A fallback to window.onload, that will always work
 	jQuery.event.add( window, "load", jQuery.ready );
-	
-};
+}