From 74cdd784975ba6e628d1934a859faeb017824a5f Mon Sep 17 00:00:00 2001
From: jaubourg <j@ubourg.net>
Date: Thu, 13 Sep 2012 15:44:12 +0200
Subject: deferred.promise(obj) should work with non-objects. Fixes #12521.
 Much needed unit tests added!

---
 src/deferred.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/deferred.js b/src/deferred.js
index f0b1f96e6..e525fc068 100644
--- a/src/deferred.js
+++ b/src/deferred.js
@@ -44,7 +44,7 @@ jQuery.extend({
 				// Get a promise for this deferred
 				// If obj is provided, the promise aspect is added to the object
 				promise: function( obj ) {
-					return typeof obj === "object" ? jQuery.extend( obj, promise ) : promise;
+					return obj != null ? jQuery.extend( obj, promise ) : promise;
 				}
 			},
 			deferred = {};
-- 
cgit v1.2.3