Skip to content
Permalink
Browse files
Added fix for jQuery.extend( Object, null || undefined ) lapsing back…
… to just jQuery.extend( Object ).
  • Loading branch information
jeresig committed Oct 15, 2006
1 parent af961d5 commit c9511ef948ec3fd58bfd0af8898ef66abdc80255
Showing with 9 additions and 0 deletions.
  1. +9 −0 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;
};

0 comments on commit c9511ef

Please sign in to comment.