git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed [1993] although it actually wasn't a bug in the core but rather a misunderstand...
[jquery.git]
/
src
/
core.js
diff --git
a/src/core.js
b/src/core.js
index
4c12150
..
bd6d929
100644
(file)
--- a/
src/core.js
+++ b/
src/core.js
@@
-530,7
+530,7
@@
jQuery.extend = jQuery.fn.extend = function() {
}
// Handle case when target is a string or something (possible in deep copy)
}
// Handle case when target is a string or something (possible in deep copy)
- if ( typeof target != "object" )
+ if ( typeof target != "object" && typeof target != "function" )
target = {};
// extend jQuery itself if only one argument is passed
target = {};
// extend jQuery itself if only one argument is passed
@@
-553,7
+553,7
@@
jQuery.extend = jQuery.fn.extend = function() {
target[ name ] = jQuery.extend( target[ name ], options[ name ] );
// Don't bring in undefined values
target[ name ] = jQuery.extend( target[ name ], options[ name ] );
// Don't bring in undefined values
- else if ( options[ name ] !== undefined )
+ else if ( options[ name ] != undefined )
target[ name ] = options[ name ];
}
target[ name ] = options[ name ];
}
@@
-591,7
+591,6
@@
jQuery.extend({
},
// Evalulates a script in a global context
},
// Evalulates a script in a global context
- // Evaluates Async. in Safari 2 :-(
globalEval: function( data ) {
data = jQuery.trim( data );
globalEval: function( data ) {
data = jQuery.trim( data );