X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fcore.js;h=7b97646aef96e0bf3ffc40c9932271bae1593681;hb=1ac9d6fbeed214d59ea5c31a87ff2c19bb08dbc8;hp=d396ee95a6844161fe6ad507437c7a8afdf6a0fd;hpb=e287007f6a129901a07b6a342d0c7bfa36a7a868;p=jquery.git

diff --git a/src/core.js b/src/core.js
index d396ee9..7b97646 100644
--- a/src/core.js
+++ b/src/core.js
@@ -10,8 +10,8 @@
  */
 
 // Map over jQuery in case of overwrite
-if ( typeof jQuery != "undefined" )
-	var _jQuery = jQuery;
+if ( window.jQuery )
+	var _jQuery = window.jQuery;
 
 var jQuery = window.jQuery = function( selector, context ) {
 	// If the context is a namespace object, return a new object
@@ -21,8 +21,8 @@ var jQuery = window.jQuery = function( selector, context ) {
 };
 
 // Map over the $ in case of overwrite
-if ( typeof $ != "undefined" )
-	var _$ = $;
+if ( window.$ )
+	var _$ = window.$;
 	
 // Map the jQuery namespace to the '$' one
 window.$ = jQuery;
@@ -534,7 +534,7 @@ jQuery.extend = jQuery.fn.extend = function() {
 					continue;
 
 				// Recurse if we're merging object values
-				if ( deep && typeof options[ name ] == "object" && target[ name ] )
+				if ( deep && typeof options[ name ] == "object" && target[ name ] && !options[ name ].nodeType )
 					jQuery.extend( target[ name ], options[ name ] );
 
 				// Don't bring in undefined values
@@ -1296,7 +1296,7 @@ jQuery.each([ "Height", "Width" ], function(i, name){
 			jQuery.browser.opera && document.body[ "client" + name ] || 
 			
 			// Safari reports inner[Width/Height] just fine (Mozilla and Opera include scroll bar widths)
-			jQuery.browser.safari && self[ "inner" + name ] ||
+			jQuery.browser.safari && window[ "inner" + name ] ||
 			
 			// Everyone else use document.documentElement or document.body depending on Quirks vs Standards mode
 			document.compatMode == "CSS1Compat" && document.documentElement[ "client" + name ] || document.body[ "client" + name ] :