From: Karl Swedberg <kswedberg@gmail.com>
Date: Thu, 10 Dec 2009 22:44:30 +0000 (-0800)
Subject: combined jQuery.bind() and jQuery.one() to make them more DRY
X-Git-Url: http://git.asbjorn.biz/?a=commitdiff_plain;h=1bac61655b6c323ab4bcfc65b0d95c1587dd8503;p=jquery.git

combined jQuery.bind() and jQuery.one() to make them more DRY
---

diff --git a/src/event.js b/src/event.js
index a32f033..26f414e 100644
--- a/src/event.js
+++ b/src/event.js
@@ -697,33 +697,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;
 		}
@@ -734,15 +713,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 ) {
@@ -751,12 +732,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 );