X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fevent.js;h=c3c978b7f1c8bf800872530ba626b0f14c35aced;hb=19cd84cf3261ee412a2521df73dcf9d6cfba04a3;hp=cac56bd6f75bc432d1f2a5441c5ecff05892269f;hpb=b763cc6602fdf2bede16be5bf106ceaa1d1d0525;p=jquery.git

diff --git a/src/event.js b/src/event.js
index cac56bd..c3c978b 100644
--- a/src/event.js
+++ b/src/event.js
@@ -57,7 +57,7 @@ jQuery.event = {
 			// Namespaced event handlers
 			var namespaces = type.split(".");
 			type = namespaces.shift();
-			handler.type = namespaces.slice().sort().join(".");
+			handler.type = namespaces.slice(0).sort().join(".");
 
 			// Get the current list of functions bound to this event
 			var handlers = events[ type ],
@@ -133,7 +133,7 @@ jQuery.event = {
 					var namespaces = type.split(".");
 					type = namespaces.shift();
 					var all = !namespaces.length,
-						namespace = new RegExp("(^|\\.)" + namespaces.slice().sort().join(".*\\.") + "(\\.|$)"),
+						namespace = new RegExp("(^|\\.)" + namespaces.slice(0).sort().join(".*\\.") + "(\\.|$)"),
 						special = this.special[ type ] || {};
 
 					if ( events[ type ] ) {
@@ -247,16 +247,22 @@ jQuery.event = {
 			handle.apply( elem, data );
 		}
 
+		var nativeFn, nativeHandler;
+		try {
+			nativeFn = elem[ type ];
+			nativeHandler = elem[ "on" + type ];
+		// prevent IE from throwing an error for some elements with some event types, see #3533
+		} catch (e) {}
 		// Handle triggering native .onfoo handlers (and on links since we don't call .click() for links)
-		if ( (!elem[ type ] || (jQuery.nodeName(elem, 'a') && type === "click")) && elem["on"+type] && elem["on"+type].apply( elem, data ) === false ) {
+		if ( (!nativeFn || (jQuery.nodeName(elem, 'a') && type === "click")) && nativeHandler && nativeHandler.apply( elem, data ) === false ) {
 			event.result = false;
 		}
 
 		// Trigger the native events (except for clicks on links)
-		if ( !bubbling && elem[ type ] && !event.isDefaultPrevented() && !(jQuery.nodeName(elem, 'a') && type === "click") ) {
+		if ( !bubbling && nativeFn && !event.isDefaultPrevented() && !(jQuery.nodeName(elem, 'a') && type === "click") ) {
 			this.triggered = true;
 			try {
-				elem[ type ]();
+				nativeFn();
 			// prevent IE from throwing an error for some hidden elements
 			} catch (e) {}
 		}
@@ -285,7 +291,7 @@ jQuery.event = {
 		// Cache this now, all = true means, any handler
 		all = !namespaces.length && !event.exclusive;
 
-		var namespace = new RegExp("(^|\\.)" + namespaces.slice().sort().join(".*\\.") + "(\\.|$)");
+		var namespace = new RegExp("(^|\\.)" + namespaces.slice(0).sort().join(".*\\.") + "(\\.|$)");
 
 		handlers = ( jQuery.data(this, "events") || {} )[ event.type ];
 
@@ -368,7 +374,7 @@ jQuery.event = {
 
 		// Add which for click: 1 == left; 2 == middle; 3 == right
 		// Note: button is not normalized, so don't use it
-		if ( !event.which && event.button ) {
+		if ( !event.which && event.button !== undefined ) {
 			event.which = (event.button & 1 ? 1 : ( event.button & 2 ? 3 : ( event.button & 4 ? 2 : 0 ) ));
 		}
 
@@ -512,9 +518,10 @@ var withinElement = function( event ) {
 	}
 };
 
+// Create mouseenter and mouseleave events
 jQuery.each({
-	mouseover: 'mouseenter',
-	mouseout: 'mouseleave'
+	mouseover: "mouseenter",
+	mouseout: "mouseleave"
 }, function( orig, fix ) {
 	jQuery.event.special[ fix ] = {
 		setup: function(){
@@ -526,12 +533,40 @@ jQuery.each({
 	};
 });
 
+// Create "bubbling" focus and blur events
+jQuery.each({
+	focus: "focusin",
+	blur: "focusout"
+}, function( orig, fix ){
+	var event = jQuery.event,
+		special = event.special,
+		handle = event.handle;
+	
+	function ieHandler() { 
+		arguments[0].type = orig;
+		return handle.apply(this, arguments);
+	}
+
+	special[orig] = {
+		setup:function() {
+			if ( this.addEventListener )
+				this.addEventListener( orig, handle, true );
+			else
+				jQuery.event.add( this, fix, ieHandler );
+		}, 
+		teardown:function() { 
+			if ( this.removeEventListener )
+				this.removeEventListener( orig, handle, true );
+			else
+				jQuery.event.remove( this, fix, ieHandler );
+		}
+	};
+});
+
 jQuery.fn.extend({
 	bind: function( type, data, fn, thisObject ) {
 		if ( jQuery.isFunction( data ) ) {
-			if ( fn !== undefined ) {
-				thisObject = fn;
-			}
+			thisObject = fn;
 			fn = data;
 			data = undefined;
 		}
@@ -543,9 +578,7 @@ jQuery.fn.extend({
 
 	one: function( type, data, fn, thisObject ) {
 		if ( jQuery.isFunction( data ) ) {
-			if ( fn !== undefined ) {
-				thisObject = fn;
-			}
+			thisObject = fn;
 			fn = data;
 			data = undefined;
 		}
@@ -709,6 +742,12 @@ 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
@@ -764,11 +803,10 @@ jQuery.each( ("blur,focus,load,resize,scroll,unload,click,dblclick," +
 });
 
 // Prevent memory leaks in IE
-// And prevent errors on refresh with events like mouseover in other browsers
 // Window isn't included so as not to unbind existing unload events
 // More info:
 //  - http://isaacschlueter.com/2006/10/msie-memory-leaks/
-//  - https://bugzilla.mozilla.org/show_bug.cgi?id=252542
+/*@cc_on
 jQuery( window ).bind( 'unload', function() {
 	for ( var id in jQuery.cache ) {
 		// Skip the window
@@ -777,3 +815,4 @@ jQuery( window ).bind( 'unload', function() {
 		}
 	}
 });
+@*/