X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fevent.js;h=b50a1ec4e0249c07c0f42f7cd2be81f890225e66;hb=aa81bb5e458efd25981933c339ac1a0090e6eb0f;hp=c2d74763cb673ea133c2ffa92074b92012a71942;hpb=542099a278e79dce38e814e7e7b448a1b73df82f;p=jquery.git

diff --git a/src/event.js b/src/event.js
index c2d7476..b50a1ec 100644
--- a/src/event.js
+++ b/src/event.js
@@ -37,13 +37,20 @@ jQuery.event = {
 
 		// Init the element's event structure
 		var events = jQuery.data( elem, "events" ) || jQuery.data( elem, "events", {} ),
-			handle = jQuery.data( elem, "handle" ) || jQuery.data( elem, "handle", function() {
+			handle = jQuery.data( elem, "handle" ), eventHandle;
+
+		if ( !handle ) {
+			eventHandle = function() {
 				// Handle the second event of a trigger and when
 				// an event is called after a page has unloaded
 				return typeof jQuery !== "undefined" && !jQuery.event.triggered ?
-					jQuery.event.handle.apply( arguments.callee.elem, arguments ) :
+					jQuery.event.handle.apply( eventHandle.elem, arguments ) :
 					undefined;
-			});
+			};
+
+			handle = jQuery.data( elem, "handle", eventHandle );
+		}
+
 		// Add elem as a property of the handle function
 		// This is to prevent a memory leak with non-native
 		// event in IE.
@@ -253,8 +260,10 @@ jQuery.event = {
 
 		var nativeFn, nativeHandler;
 		try {
-			nativeFn = elem[ type ];
-			nativeHandler = elem[ "on" + type ];
+			if ( !(elem && elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()]) ) {
+				nativeFn = elem[ type ];
+				nativeHandler = elem[ "on" + type ];
+			}
 		// prevent IE from throwing an error for some elements with some event types, see #3533
 		} catch (e) {}
 
@@ -264,12 +273,12 @@ jQuery.event = {
 		if ( !bubbling && nativeFn && !event.isDefaultPrevented() && !isClick ) {
 			this.triggered = true;
 			try {
-				nativeFn();
+				elem[ type ]();
 			// prevent IE from throwing an error for some hidden elements
 			} catch (e) {}
 
 		// Handle triggering native .onfoo handlers
-		} else if ( nativeHandler && nativeHandler.apply( elem, data ) === false ) {
+		} else if ( nativeHandler && elem[ "on" + type ].apply( elem, data ) === false ) {
 			event.result = false;
 		}
 
@@ -405,7 +414,7 @@ jQuery.event = {
 	special: {
 		ready: {
 			// Make sure the ready event is setup
-			setup: bindReady,
+			setup: jQuery.bindReady,
 			teardown: function() {}
 		},
 
@@ -569,9 +578,11 @@ jQuery.each({
 });
 
 // submit delegation
+if ( !jQuery.support.submitBubbles ) {
+
 jQuery.event.special.submit = {
 	setup: function( data, namespaces, fn ) {
-		if ( !jQuery.support.submitBubbles && this.nodeName.toLowerCase() !== "form" ) {
+		if ( this.nodeName.toLowerCase() !== "form" ) {
 			jQuery.event.add(this, "click.specialSubmit." + fn.guid, function( e ) {
 				var elem = e.target, type = elem.type;
 
@@ -588,8 +599,6 @@ jQuery.event.special.submit = {
 				}
 			});
 		}
-
-		return false;
 	},
 
 	remove: function( namespaces, fn ) {
@@ -598,7 +607,11 @@ jQuery.event.special.submit = {
 	}
 };
 
+}
+
 // change delegation, happens here so we have bind.
+if ( !jQuery.support.changeBubbles ) {
+
 jQuery.event.special.change = {
 	filters: {
 		click: function( e ) { 
@@ -647,27 +660,24 @@ jQuery.event.special.change = {
 		}
 	},
 	setup: function( data, namespaces, fn ) {
-		// return false if we bubble
-		if ( !jQuery.support.changeBubbles ) {
-			for ( var type in changeFilters ) {
-				jQuery.event.add( this, type + ".specialChange." + fn.guid, changeFilters[type] );
-			}
+		for ( var type in changeFilters ) {
+			jQuery.event.add( this, type + ".specialChange." + fn.guid, changeFilters[type] );
 		}
 		
 		// always want to listen for change for trigger
 		return false;
 	},
 	remove: function( namespaces, fn ) {
-		if ( !jQuery.support.changeBubbles ) {
-			for ( var type in changeFilters ) {
-				jQuery.event.remove( this, type + ".specialChange" + (fn ? "."+fn.guid : ""), changeFilters[type] );
-			}
+		for ( var type in changeFilters ) {
+			jQuery.event.remove( this, type + ".specialChange" + (fn ? "."+fn.guid : ""), changeFilters[type] );
 		}
 	}
 };
 
 var changeFilters = jQuery.event.special.change.filters;
 
+}
+
 function trigger( type, elem, args ) {
 	args[0].type = type;
 	return jQuery.event.handle.apply( elem, args );
@@ -677,7 +687,7 @@ function trigger( type, elem, args ) {
 if ( !jQuery.support.focusBubbles ) {
 
 jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ){
-	event.special[ orig ] = {
+	jQuery.event.special[ orig ] = {
 		setup: function() {
 			jQuery.event.add( this, fix, ieHandler );
 		}, 
@@ -694,33 +704,12 @@ jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ){
 
 }
 
-jQuery.fn.extend({
-	// TODO: make bind(), unbind() and one() DRY!
-	bind: function( type, data, fn, thisObject ) {
-		// Handle object literals
-		if ( typeof type === "object" ) {
-			for ( var key in type ) {
-				this.bind(key, data, type[key], fn);
-			}
-			return this;
-		}
-		
-		if ( jQuery.isFunction( data ) ) {
-			thisObject = fn;
-			fn = data;
-			data = undefined;
-		}
-		fn = thisObject === undefined ? fn : jQuery.event.proxy( fn, thisObject );
-		return type === "unload" ? this.one(type, data, fn, thisObject) : this.each(function() {
-			jQuery.event.add( this, type, fn, data );
-		});
-	},
-
-	one: function( type, data, fn, thisObject ) {
+jQuery.each(["bind", "one"], function(i, name) {
+	jQuery.fn[ name ] = function( type, data, fn, thisObject ) {
 		// Handle object literals
 		if ( typeof type === "object" ) {
 			for ( var key in type ) {
-				this.one(key, data, type[key], fn);
+				this[ name ](key, data, type[key], fn);
 			}
 			return this;
 		}
@@ -731,15 +720,17 @@ jQuery.fn.extend({
 			data = undefined;
 		}
 		fn = thisObject === undefined ? fn : jQuery.event.proxy( fn, thisObject );
-		var one = jQuery.event.proxy( fn, function( event ) {
-			jQuery( this ).unbind( event, one );
+		var handler = name == "one" ? jQuery.event.proxy( fn, function( event ) {
+			jQuery( this ).unbind( event, handler );
 			return fn.apply( this, arguments );
+		}) : fn;
+		return type === "unload" ? this.one(type, data, handler, thisObject) : this.each(function() {
+			jQuery.event.add( this, type, handler, data );
 		});
-		return this.each(function() {
-			jQuery.event.add( this, type, one, data );
-		});
-	},
+	};
+});
 
+jQuery.fn.extend({
 	unbind: function( type, fn ) {
 		// Handle object literals
 		if ( typeof type === "object" && !type.preventDefault ) {
@@ -748,12 +739,11 @@ jQuery.fn.extend({
 			}
 			return this;
 		}
-		
+
 		return this.each(function() {
 			jQuery.event.remove( this, type, fn );
 		});
 	},
-
 	trigger: function( type, data ) {
 		return this.each(function() {
 			jQuery.event.trigger( type, data, this );
@@ -796,24 +786,6 @@ jQuery.fn.extend({
 		return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
 	},
 
-	ready: function( fn ) {
-		// Attach the listeners
-		bindReady();
-
-		// If the DOM is already ready
-		if ( jQuery.isReady ) {
-			// Execute the function immediately
-			fn.call( document, jQuery );
-
-		// Otherwise, remember the function for later
-		} else {
-			// Add the function to the wait list
-			jQuery.readyList.push( fn );
-		}
-
-		return this;
-	},
-
 	live: function( type, data, fn, thisObject ) {
 		if ( jQuery.isFunction( data ) ) {
 			if ( fn !== undefined ) {
@@ -889,106 +861,7 @@ function liveHandler( event ) {
 }
 
 function liveConvert( type, selector ) {
-	return ["live", type, selector//.replace(/[^\w\s\.]/g, function(ch){ return "\\"+ch})
-								  .replace(/\./g, "`")
-								  .replace(/ /g, "|")].join(".");
-}
-
-jQuery.extend({
-	isReady: false,
-	readyList: [],
-	// Handle when the DOM is ready
-	ready: function() {
-		// Make sure that the DOM is not already loaded
-		if ( !jQuery.isReady ) {
-			if ( !document.body ) {
-				return setTimeout( jQuery.ready, 13 );
-			}
-
-			// Remember that the DOM is ready
-			jQuery.isReady = true;
-
-			// If there are functions bound, to execute
-			if ( jQuery.readyList ) {
-				// Execute all of them
-				var fn, i = 0;
-				while ( (fn = jQuery.readyList[ i++ ]) ) {
-					fn.call( document, jQuery );
-				}
-
-				// Reset the list of functions
-				jQuery.readyList = null;
-			}
-
-			// Trigger any bound ready events
-			jQuery( document ).triggerHandler( "ready" );
-		}
-	}
-});
-
-var readyBound = false;
-
-function bindReady() {
-	if ( readyBound ) { return; }
-	readyBound = true;
-
-	// Catch cases where $(document).ready() is called after the
-	// browser event has already occurred.
-	if ( document.readyState === "complete" ) {
-		return jQuery.ready();
-	}
-
-	// Mozilla, Opera and webkit nightlies currently support this event
-	if ( document.addEventListener ) {
-		// Use the handy event callback
-		document.addEventListener( "DOMContentLoaded", function() {
-			document.removeEventListener( "DOMContentLoaded", arguments.callee, false );
-			jQuery.ready();
-		}, false );
-
-	// If IE event model is used
-	} else if ( document.attachEvent ) {
-		// ensure firing before onload,
-		// maybe late but safe also for iframes
-		document.attachEvent("onreadystatechange", function() {
-			// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
-			if ( document.readyState === "complete" ) {
-				document.detachEvent( "onreadystatechange", arguments.callee );
-				jQuery.ready();
-			}
-		});
-
-		// If IE and not a frame
-		// continually check to see if the document is ready
-		var toplevel = false;
-
-		try {
-			toplevel = window.frameElement == null;
-		} catch(e){}
-
-		if ( document.documentElement.doScroll && toplevel ) {
-			(function() {
-				if ( jQuery.isReady ) {
-					return;
-				}
-
-				try {
-					// If IE is used, use the trick by Diego Perini
-					// http://javascript.nwbox.com/IEContentLoaded/
-					document.documentElement.doScroll("left");
-				} catch( error ) {
-					setTimeout( arguments.callee, 0 );
-					return;
-				}
-
-				// and execute any waiting functions
-				jQuery.ready();
-			})();
-		}
-	}
-
-	// A fallback to window.onload, that will always work
-	jQuery.event.add( window, "load", jQuery.ready );
+	return ["live", type, selector.replace(/\./g, "`").replace(/ /g, "&")].join(".");
 }
 
 jQuery.each( ("blur focus load resize scroll unload click dblclick " +
@@ -999,6 +872,10 @@ jQuery.each( ("blur focus load resize scroll unload click dblclick " +
 	jQuery.fn[ name ] = function( fn ) {
 		return fn ? this.bind( name, fn ) : this.trigger( name );
 	};
+
+	if ( jQuery.fnAttr ) {
+		jQuery.fnAttr[ name ] = true;
+	}
 });
 
 // Prevent memory leaks in IE
@@ -1006,11 +883,13 @@ jQuery.each( ("blur focus load resize scroll unload click dblclick " +
 // More info:
 //  - http://isaacschlueter.com/2006/10/msie-memory-leaks/
 /*@cc_on
-jQuery( window ).bind( 'unload', function() {
+window.attachEvent("onunload", function() {
 	for ( var id in jQuery.cache ) {
-		// Skip the window
-		if ( id != 1 && jQuery.cache[ id ].handle ) {
-			jQuery.event.remove( jQuery.cache[ id ].handle.elem );
+		if ( jQuery.cache[ id ].handle ) {
+			// Try/Catch is to handle iframes being unloaded, see #4280
+			try {
+				jQuery.event.remove( jQuery.cache[ id ].handle.elem );
+			} catch(e) {}
 		}
 	}
 });