X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fevent.js;h=97cb0ccabd3e65bc08046fe71cd02e8ae701b9e7;hb=66975de2d249643779e2b3daad0457f7f5f92508;hp=72ebcf7e67a4233e19b047b6759c16924c6d135e;hpb=e083d15fc786a853e54b800e3798536f1d958301;p=jquery.git

diff --git a/src/event.js b/src/event.js
index 72ebcf7..97cb0cc 100644
--- a/src/event.js
+++ b/src/event.js
@@ -1,3 +1,9 @@
+var fcleanup = function( nm ) {
+	return nm.replace(/[^\w\s\.\|`]/g, function( ch ) {
+		return "\\" + ch;
+	});
+};
+
 /*
  * A number of helper functions used for managing events.
  * Many of the ideas behind this code originated from
@@ -29,7 +35,7 @@ jQuery.event = {
 			var fn = handler;
 
 			// Create unique handler function, wrapped around original handler
-			handler = this.proxy( fn );
+			handler = jQuery.proxy( fn );
 
 			// Store data in unique handler
 			handler.data = data;
@@ -142,7 +148,7 @@ jQuery.event = {
 					var namespaces = type.split(".");
 					type = namespaces.shift();
 					var all = !namespaces.length,
-						cleaned = jQuery.map( namespaces.slice(0).sort() , function(nm){ return nm.replace(/[^\w\s\.\|`]/g, function(ch){return "\\"+ch;  }); }),
+						cleaned = jQuery.map( namespaces.slice(0).sort(), fcleanup ),
 						namespace = new RegExp("(^|\\.)" + cleaned.join("\\.(?:.*\\.)?") + "(\\.|$)"),
 						special = this.special[ type ] || {};
 
@@ -224,6 +230,7 @@ jQuery.event = {
 			if ( !elem ) {
 				// Don't bubble custom events when global (to avoid too much overhead)
 				event.stopPropagation();
+
 				// Only trigger if we've ever bound an event for it
 				if ( this.global[ type ] ) {
 					jQuery.each( jQuery.cache, function() {
@@ -398,19 +405,6 @@ jQuery.event = {
 		return event;
 	},
 
-	proxy: function( fn, proxy, thisObject ) {
-		if ( proxy !== undefined && !jQuery.isFunction( proxy ) ) {
-			thisObject = proxy;
-			proxy = undefined;
-		}
-		// FIXME: Should proxy be redefined to be applied with thisObject if defined?
-		proxy = proxy || function() { return fn.apply( thisObject !== undefined ? thisObject : this, arguments ); };
-		// Set the guid of unique handler to the same of original handler, so it can be removed
-		proxy.guid = fn.guid = fn.guid || proxy.guid || this.guid++;
-		// So proxy can be declared as an argument
-		return proxy;
-	},
-
 	special: {
 		ready: {
 			// Make sure the ready event is setup
@@ -462,7 +456,25 @@ jQuery.event = {
 	}
 };
 
-jQuery.Event = function( src ){
+jQuery.event.proxy = jQuery.proxy = function( fn, proxy, thisObject ) {
+	if ( proxy !== undefined && !jQuery.isFunction( proxy ) ) {
+		thisObject = proxy;
+		proxy = undefined;
+	}
+
+	// FIXME: Should proxy be redefined to be applied with thisObject if defined?
+	proxy = proxy || function() {
+		return fn.apply( thisObject !== undefined ? thisObject : this, arguments );
+	};
+
+	// Set the guid of unique handler to the same of original handler, so it can be removed
+	proxy.guid = fn.guid = fn.guid || proxy.guid || jQuery.event.guid++;
+
+	// So proxy can be declared as an argument
+	return proxy;
+};
+
+jQuery.Event = function( src ) {
 	// Allow instantiation without the 'new' keyword
 	if ( !this.preventDefault ) {
 		return new jQuery.Event( src );
@@ -524,7 +536,7 @@ jQuery.Event.prototype = {
 		// otherwise set the cancelBubble property of the original event to true (IE)
 		e.cancelBubble = true;
 	},
-	stopImmediatePropagation: function(){
+	stopImmediatePropagation: function() {
 		this.isImmediatePropagationStopped = returnTrue;
 		this.stopPropagation();
 	},
@@ -532,23 +544,30 @@ jQuery.Event.prototype = {
 	isPropagationStopped: returnFalse,
 	isImmediatePropagationStopped: returnFalse
 };
+
 // Checks if an event happened on an element within another element
 // Used in jQuery.event.special.mouseenter and mouseleave handlers
 var withinElement = function( event ) {
 	// Check if mouse(over|out) are still within the same parent element
 	var parent = event.relatedTarget;
+
 	// Traverse up the tree
-	while ( parent && parent != this ) {
+	while ( parent && parent !== this ) {
 		// Firefox sometimes assigns relatedTarget a XUL element
 		// which we cannot access the parentNode property of
-		try { parent = parent.parentNode; }
+		try {
+			parent = parent.parentNode;
+
 		// assuming we've left the element since we most likely mousedover a xul element
-		catch(e) { break; }
+		} catch(e) {
+			break;
+		}
 	}
 
-	if ( parent != this ) {
+	if ( parent !== this ) {
 		// set the correct event type
 		event.type = event.data;
+
 		// handle event if we actually just moused on to a non sub-element
 		jQuery.event.handle.apply( this, arguments );
 	}
@@ -568,10 +587,10 @@ jQuery.each({
 	mouseleave: "mouseout"
 }, function( orig, fix ) {
 	jQuery.event.special[ orig ] = {
-		setup: function(data){
+		setup: function( data ) {
 			jQuery.event.add( this, fix, data && data.selector ? delegate : withinElement, orig );
 		},
-		teardown: function(data){
+		teardown: function( data ) {
 			jQuery.event.remove( this, fix, data && data.selector ? delegate : withinElement );
 		}
 	};
@@ -672,7 +691,7 @@ jQuery.event.special.change = {
 		},
 
 		// Change has to be called before submit
-		// Keydown will be called before keypress, wich is used in submit-event delegation
+		// Keydown will be called before keypress, which is used in submit-event delegation
 		keydown: function( e ) {
 			var elem = e.target, type = elem.type;
 
@@ -721,7 +740,7 @@ function trigger( type, elem, args ) {
 
 // Create "bubbling" focus and blur events
 if ( document.addEventListener ) {
-	jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ){
+	jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
 		jQuery.event.special[ fix ] = {
 			setup: function() {
 				this.addEventListener( orig, handler, true );
@@ -739,8 +758,8 @@ if ( document.addEventListener ) {
 	});
 }
 
-jQuery.each(["bind", "one"], function(i, name) {
-	jQuery.fn[ name ] = function( type, data, fn, thisObject ) {
+jQuery.each(["bind", "one"], function( i, name ) {
+	jQuery.fn[ name ] = function( type, data, fn ) {
 		// Handle object literals
 		if ( typeof type === "object" ) {
 			for ( var key in type ) {
@@ -754,12 +773,13 @@ jQuery.each(["bind", "one"], function(i, name) {
 			fn = data;
 			data = undefined;
 		}
-		fn = thisObject === undefined ? fn : jQuery.event.proxy( fn, thisObject );
-		var handler = name === "one" ? jQuery.event.proxy( fn, function( event ) {
+
+		var handler = name === "one" ? jQuery.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() {
+
+		return type === "unload" ? this.one(type, data, handler) : this.each(function() {
 			jQuery.event.add( this, type, handler, data );
 		});
 	};
@@ -800,14 +820,14 @@ jQuery.fn.extend({
 		var args = arguments, i = 1;
 
 		// link all the functions, so any of them can unbind this click handler
-		while( i < args.length ) {
-			jQuery.event.proxy( fn, args[ i++ ] );
+		while ( i < args.length ) {
+			jQuery.proxy( fn, args[ i++ ] );
 		}
 
-		return this.click( jQuery.event.proxy( fn, function( event ) {
+		return this.click( jQuery.proxy( fn, function( event ) {
 			// Figure out which function to execute
-			var lastToggle = ( jQuery.data( this, 'lastToggle' + fn.guid ) || 0 ) % i;
-			jQuery.data( this, 'lastToggle' + fn.guid, lastToggle + 1 );
+			var lastToggle = ( jQuery.data( this, "lastToggle" + fn.guid ) || 0 ) % i;
+			jQuery.data( this, "lastToggle" + fn.guid, lastToggle + 1 );
 
 			// Make sure that clicks stop
 			event.preventDefault();
@@ -821,17 +841,16 @@ jQuery.fn.extend({
 		return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
 	},
 
-	live: function( type, data, fn, thisObject ) {
+	live: function( type, data, fn ) {
 		if ( jQuery.isFunction( data ) ) {
-			if ( fn !== undefined ) {
-				thisObject = fn;
-			}
 			fn = data;
 			data = undefined;
 		}
+
 		jQuery( this.context ).bind( liveConvert( type, this.selector ), {
 			data: data, selector: this.selector, live: type
-		}, fn, thisObject );
+		}, fn );
+
 		return this;
 	},