Added a check to make sure a parent node exists in call remove() to avoid errors...

[jquery.git] / src / core.js

diff --git a/src/core.js b/src/core.js
index d396ee9..9e36082 100644 (file)
--- a/src/core.js
+++ b/src/core.js
@@ -10,8 +10,8 @@
  */\r
 \r
 // Map over jQuery in case of overwrite\r
-if ( typeof jQuery != "undefined" )\r
-       var _jQuery = jQuery;\r
+if ( window.jQuery )\r
+       var _jQuery = window.jQuery;\r
 \r
 var jQuery = window.jQuery = function( selector, context ) {\r
        // If the context is a namespace object, return a new object\r
@@ -21,8 +21,8 @@ var jQuery = window.jQuery = function( selector, context ) {
 };\r
 \r
 // Map over the $ in case of overwrite\r
-if ( typeof $ != "undefined" )\r
-       var _$ = $;\r
+if ( window.$ )\r
+       var _$ = window.$;\r
        \r
 // Map the jQuery namespace to the '$' one\r
 window.$ = jQuery;\r
@@ -534,7 +534,7 @@ jQuery.extend = jQuery.fn.extend = function() {
                                        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
@@ -1268,7 +1268,8 @@ jQuery.each({
                                jQuery.event.remove(this);\r
                                jQuery.removeData(this);\r
                        });\r
-                       this.parentNode.removeChild( this );\r
+                       if (this.parentNode)\r
+                               this.parentNode.removeChild( this );\r
                }\r
        },\r
 \r
@@ -1296,7 +1297,7 @@ jQuery.each([ "Height", "Width" ], function(i, name){
                        jQuery.browser.opera && document.body[ "client" + name ] || \r
                        \r
                        // Safari reports inner[Width/Height] just fine (Mozilla and Opera include scroll bar widths)\r
-                       jQuery.browser.safari && self[ "inner" + name ] ||\r
+                       jQuery.browser.safari && window[ "inner" + name ] ||\r
                        \r
                        // Everyone else use document.documentElement or document.body depending on Quirks vs Standards mode\r
                        document.compatMode == "CSS1Compat" && document.documentElement[ "client" + name ] || document.body[ "client" + name ] :\r