X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fevent%2Fevent.js;h=3df1ae716ef1fea5bb3fe5b83f3aa737b9e7c957;hb=a5c319f922efcf34652d0632a945d20a0ab36ca6;hp=f264a2cd2223598a7e396f2e941a8ea12f6cad7a;hpb=f267cfaedf9f01ddf1f6f9c214ea07906c01a84a;p=jquery.git

diff --git a/src/event/event.js b/src/event/event.js
index f264a2c..3df1ae7 100644
--- a/src/event/event.js
+++ b/src/event/event.js
@@ -71,12 +71,8 @@ jQuery.event = {
 		// Add the function to the element's handler list
 		handlers[handler.guid] = handler;
 
-		// Remember the function in a global list (for triggering)
-		if (!this.global[type])
-			this.global[type] = [];
-		// Only add the element to the global list once
-		if (jQuery.inArray(element, this.global[type]) == -1)
-			this.global[type].push( element );
+		// Keep track of which events have been used, for global triggering
+		this.global[type] = true;
 	},
 
 	guid: 1,
@@ -116,10 +112,6 @@ jQuery.event = {
 						element.detachEvent("on" + type, element.$handle);
 					ret = null;
 					delete events[type];
-					
-					// Remove element from the global event type cache
-					while ( this.global[type] && ( (index = jQuery.inArray(element, this.global[type])) >= 0 ) )
-						delete this.global[type][index];
 				}
 			}
 
@@ -130,32 +122,52 @@ jQuery.event = {
 		}
 	},
 
-	trigger: function(type, data, element) {
+	trigger: function(type, data, element, native, extra) {
 		// Clone the incoming data, if any
 		data = jQuery.makeArray(data || []);
 
 		// Handle a global trigger
-		if ( !element )
-			jQuery.each( this.global[type] || [], function(){
-				jQuery.event.trigger( type, data, this );
-			});
+		if ( !element ) {
+			// Only trigger if we've ever bound an event for it
+			if ( this.global[type] )
+				jQuery("*").add([window, document]).trigger(type, data);
 
 		// Handle triggering a single element
-		else {
-			var val, ret, fn = jQuery.isFunction( element[ type ] || null );
+		} else {
+			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 )) !== false )
-				this.triggered = true;
+			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;
+
+			// Extra functions don't get the custom event object
+			if ( evt )
+				data.shift();
 
-			if ( fn && val !== false && !jQuery.nodeName(element, 'a') )
+			// 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) {
@@ -165,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 ) {
@@ -174,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;
 			}
 		}
 
@@ -200,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;
 		};
@@ -407,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 
@@ -482,7 +503,7 @@ jQuery.fn.extend({
 			var p = e.relatedTarget;
 	
 			// Traverse up the tree
-			while ( p && p != this ) try { p = p.parentNode } catch(e) { p = this; };
+			while ( p && p != this ) try { p = p.parentNode; } catch(e) { p = this; };
 			
 			// If we actually just moused on to a sub-element, ignore it
 			if ( p == this ) return false;
@@ -533,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
@@ -541,7 +565,7 @@ jQuery.fn.extend({
 		// Otherwise, remember the function for later
 		else
 			// Add the function to the wait list
-			jQuery.readyList.push( function() { return f.apply(this, [jQuery]) } );
+			jQuery.readyList.push( function() { return f.apply(this, [jQuery]); } );
 	
 		return this;
 	}
@@ -582,8 +606,6 @@ jQuery.extend({
 	}
 });
 
-new function(){
-
 	/**
 	 * Bind a function to the scroll event of each matched element.
 	 *
@@ -934,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
@@ -954,7 +982,7 @@ new function(){
 		// script does not exist if jQuery is loaded dynamically
 		if ( script ) 
 			script.onreadystatechange = function() {
-				if ( document.readyState != "complete" ) return;
+				if ( this.readyState != "complete" ) return;
 				jQuery.ready();
 			};
 	
@@ -980,18 +1008,4 @@ new function(){
 
 	// A fallback to window.onload, that will always work
 	jQuery.event.add( window, "load", jQuery.ready );
-	
-};
-
-// Clean up after IE to avoid memory leaks
-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
-					els[i-1] && jQuery.event.remove(els[i-1], type);
-				while (--i);
-		}
-	});
+}