git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix for bug #1546 where a deep copy was attempted of DOM elements (which isn't needed).
[jquery.git]
/
src
/
core.js
diff --git
a/src/core.js
b/src/core.js
index
d396ee9
..
3aea325
100644
(file)
--- a/
src/core.js
+++ b/
src/core.js
@@
-534,7
+534,7
@@
jQuery.extend = jQuery.fn.extend = function() {
continue;
\r
\r
// Recurse if we're merging object values
\r
continue;
\r
\r
// Recurse if we're merging object values
\r
- if ( deep && typeof options[ name ] == "object" && target[ name ] )
\r
+ if ( deep && typeof options[ name ] == "object" && target[ name ] && !options[ name ].nodeType )
\r
jQuery.extend( target[ name ], options[ name ] );
\r
\r
// Don't bring in undefined values
\r
jQuery.extend( target[ name ], options[ name ] );
\r
\r
// Don't bring in undefined values
\r