Skip to content
Permalink
Browse files

Fixed bug #1594, #1565, #1598 - all of which were concerning the impr…

…oper execution of embedded scripts in IE and Safari.
  • Loading branch information
jeresig committed Sep 15, 2007
1 parent 62d84e4 commit 606b863edaff29035960e4d813b45d63b8d92876
Showing with 29 additions and 10 deletions.
  1. +21 −7 src/core.js
  2. +8 −3 test/unit/core.js
@@ -394,18 +394,32 @@ jQuery.fn = jQuery.prototype = {
obj = this.getElementsByTagName("tbody")[0] || this.appendChild(document.createElement("tbody"));

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() {
// copy reference to target object
var target = arguments[0] || {}, a = 1, al = arguments.length, deep = false;
@@ -821,7 +821,7 @@ test("val(String)", function() {
});

test("html(String)", function() {
expect(1);
expect(3);
var div = $("div");
div.html("<b>test</b>");
var pass = true;
@@ -830,8 +830,13 @@ test("html(String)", function() {
}
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 );
});

test("filter()", function() {

0 comments on commit 606b863

Please sign in to comment.
You can’t perform that action at this time.