deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Added fix for jQuery.extend( Object, null || undefined ) lapsing back to just jQuery.extend( Object ).

Browse source
This commit is contained in:
John Resig 2006-10-15 03:11:02 +00:00
parent af961d58c2
commit c9511ef948
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/jquery/jquery.js vendored
View file

@ -1297,8 +1297,17 @@ jQuery.fn = jQuery.prototype = {
* @cat Javascript * @cat Javascript
*/ */
jQuery.extend = jQuery.fn.extend = function(obj,prop) { 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; } if ( !prop ) { prop = obj; obj = this; }
// Extend the base object
for ( var i in prop ) obj[i] = prop[i]; for ( var i in prop ) obj[i] = prop[i];
// Return the modified object
return obj; return obj;
}; };