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 9fd0168..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
@@ -407,7 +407,7 @@ jQuery.fn = jQuery.prototype = {
                                                        jQuery.inArray( this.text, values ) >= 0);\r
                                        });\r
 \r
-                                       if ( !tmp.length )\r
+                                       if ( !values.length )\r
                                                this.selectedIndex = -1;\r
 \r
                                } else\r
@@ -461,39 +461,51 @@ jQuery.fn = jQuery.prototype = {
                        if ( table && jQuery.nodeName( this, "table" ) && jQuery.nodeName( elems[0], "tr" ) )\r
                                obj = this.getElementsByTagName("tbody")[0] || this.appendChild( document.createElement("tbody") );\r
 \r
+                       var scripts = jQuery( [] );\r
+\r
                        jQuery.each(elems, function(){\r
                                var elem = clone ?\r
                                        this.cloneNode( true ) :\r
                                        this;\r
 \r
-                               if ( !evalScript( 0, elem ) )\r
+                               if ( jQuery.nodeName( elem, "script" ) ) {\r
+\r
+                                       // If scripts are waiting to be executed, wait on this script as well\r
+                                       if ( scripts.length )\r
+                                               scripts = scripts.add( elem );\r
+\r
+                                       // If nothing is waiting to be executed, run immediately\r
+                                       else\r
+                                               evalScript( 0, elem );\r
+\r
+                               } else {\r
+                                       // Remove any inner scripts for later evaluation\r
+                                       if ( elem.nodeType == 1 )\r
+                                               scripts = scripts.add( jQuery( "script", elem ).remove() );\r
+\r
+                                       // Inject the elements into the document\r
                                        callback.call( obj, elem );\r
+                               }\r
                        });\r
+\r
+                       scripts.each( evalScript );\r
                });\r
        }\r
 };\r
 \r
 function evalScript( i, elem ) {\r
-       var script = jQuery.nodeName( elem, "script" );\r
-\r
-       if ( script ) {\r
-               if ( elem.src )\r
-                       jQuery.ajax({\r
-                               url: elem.src,\r
-                               async: false,\r
-                               dataType: "script"\r
-                       });\r
-\r
-               else\r
-                       jQuery.globalEval( elem.text || elem.textContent || elem.innerHTML || "" );\r
-       \r
-               if ( elem.parentNode )\r
-                       elem.parentNode.removeChild( elem );\r
+       if ( elem.src )\r
+               jQuery.ajax({\r
+                       url: elem.src,\r
+                       async: false,\r
+                       dataType: "script"\r
+               });\r
 \r
-       } else if ( elem.nodeType == 1 )\r
-               jQuery( "script", elem ).each( evalScript );\r
+       else\r
+               jQuery.globalEval( elem.text || elem.textContent || elem.innerHTML || "" );\r
 \r
-       return script;\r
+       if ( elem.parentNode )\r
+               elem.parentNode.removeChild( elem );\r
 }\r
 \r
 jQuery.extend = jQuery.fn.extend = function() {\r
@@ -522,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
@@ -1256,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
@@ -1284,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