Changeset 3296

Timestamp:

09/15/07 02:16:29 (1 year ago)

Author:

jeresig

Message:

Fixed bug #1594, #1565, #1598 - all of which were concerning the improper execution of embedded scripts in IE and Safari.

Location:

trunk/jquery

Files:

• src/core.js (modified) (1 diff)
• test/unit/core.js (modified) (2 diffs)

trunk/jquery/src/core.js

@@ -395 +395 @@
 
             jQuery.each( a, function(){
-                if ( jQuery.nodeName(this, "script") ) {
-                    if ( this.src )
-                        jQuery.ajax({ url: this.src, async: false, dataType: "script" });
-                    else
-                        jQuery.globalEval( this.text || this.textContent || this.innerHTML || "" );
-                } else
-                    fn.apply( obj, [ clone ? this.cloneNode(true) : this ] );
+                var elem = clone ? this.cloneNode(true) : this;
+                if ( !evalScript(0, elem) )
+                    fn.call( obj, elem );
             });
         });
     }
 };
+
+function evalScript(i, elem){
+    var script = jQuery.nodeName(elem, "script");
+
+    if ( script ) {
+        if ( elem.src )
+            jQuery.ajax({ url: elem.src, async: false, dataType: "script" });
+        else
+            jQuery.globalEval( elem.text || elem.textContent || elem.innerHTML || "" );
+    
+        if ( elem.parentNode )
+            elem.parentNode.removeChild(elem);
+
+    } else if ( elem.nodeType == 1 )
+    jQuery("script", elem).each(evalScript);
+
+    return script;
+}
 
 jQuery.extend = jQuery.fn.extend = function() {

trunk/jquery/test/unit/core.js

@@ -822 +822 @@
 
 test("html(String)", function() {
-    expect(1);
+    expect(3);
     var div = $("div");
     div.html("<b>test</b>");
@@ -831 +831 @@
     ok( pass, "Set HTML" );
 
-    // Ccommented out until we can resolve it   
-    // $("#main").html('<script type="text/javascript">ok( true, "$().html().evalScripts() Evals Scripts Twice in Firefox, see #975" );</script>').evalScripts();
+    stop();
+
+    $("#main").html('<script type="text/javascript">ok( true, "$().html().evalScripts() Evals Scripts Twice in Firefox, see #975" );</script>');
+
+    $("#main").html('foo <form><script type="text/javascript">ok( true, "$().html().evalScripts() Evals Scripts Twice in Firefox, see #975" );</script></form>');
+
+    setTimeout( start, 100 );
 });