Skip to content
Permalink
Browse files

Fixed #1959 by postponing ALL script evaluations till the html insert…

…ion is done. Before the code would immediately execute any scripts that weren't in subelements if no subelements prior had scripts in them (i.e. once any script was postponed they all were). This could cause inconsistent behavior. Since, at this time, we have to postpone some scripts it makes more sense to postpone them all.
  • Loading branch information
davids549 committed Dec 10, 2007
1 parent f97f77c commit 9ea8017f86c48ab624fbdc0e55a79110d9c61a9f
Showing with 4 additions and 10 deletions.
  1. +2 −9 src/core.js
  2. +2 −1 test/unit/core.js
@@ -494,16 +494,9 @@ jQuery.fn = jQuery.prototype = {
this.cloneNode( true ) :
this;

// execute all scripts after the elements have been injected
if ( jQuery.nodeName( elem, "script" ) ) {

// If scripts are waiting to be executed, wait on this script as well
if ( scripts.length )
scripts = scripts.add( elem );

// If nothing is waiting to be executed, run immediately
else
evalScript( 0, elem );

scripts = scripts.add( elem );
} else {
// Remove any inner scripts for later evaluation
if ( elem.nodeType == 1 )
@@ -1022,7 +1022,8 @@ test("html(String)", function() {

$("#main").html('foo <form><script type="text/javascript">ok( true, "$().html().evalScripts() Evals Scripts Twice in Firefox, see #975" );</script></form>');

$("#main").html("<script>ok(scriptorder++ == 0, 'Script is executed in order');ok($('#scriptorder').length == 0,'Execute before html')<\/script><span id='scriptorder'><script>ok(scriptorder++ == 1, 'Script is executed in order');ok($('#scriptorder').length == 1,'Execute after html')<\/script></span><script>ok(scriptorder++ == 2, 'Script is executed in order');ok($('#scriptorder').length == 1,'Execute after html')<\/script>");
// it was decided that waiting to execute ALL scripts makes sense since nested ones have to wait anyway so this test case is changed, see #1959
$("#main").html("<script>ok(scriptorder++ == 0, 'Script is executed in order');ok($('#scriptorder').length == 1,'Execute after html (even though appears before)')<\/script><span id='scriptorder'><script>ok(scriptorder++ == 1, 'Script (nested) is executed in order');ok($('#scriptorder').length == 1,'Execute after html')<\/script></span><script>ok(scriptorder++ == 2, 'Script (unnested) is executed in order');ok($('#scriptorder').length == 1,'Execute after html')<\/script>");

setTimeout( start, 100 );
});

0 comments on commit 9ea8017

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