From c9511ef948ec3fd58bfd0af8898ef66abdc80255 Mon Sep 17 00:00:00 2001 From: John Resig Date: Sun, 15 Oct 2006 03:11:02 +0000 Subject: [PATCH] Added fix for jQuery.extend( Object, null || undefined ) lapsing back to just jQuery.extend( Object ). --- src/jquery/jquery.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js index 31dde99..6b05a06 100644 --- a/src/jquery/jquery.js +++ b/src/jquery/jquery.js @@ -1297,8 +1297,17 @@ jQuery.fn = jQuery.prototype = { * @cat Javascript */ jQuery.extend = jQuery.fn.extend = function(obj,prop) { + // Watch for the case where null or undefined gets passed in by accident + if ( arguments.length > 1 && (prop === null || prop == undefined) ) + return obj; + + // If no property object was provided, then we're extending jQuery if ( !prop ) { prop = obj; obj = this; } + + // Extend the base object for ( var i in prop ) obj[i] = prop[i]; + + // Return the modified object return obj; }; -- 1.7.10.4