Changeset 4094

Timestamp:

12/10/07 19:04:59 (8 months ago)

Author:

davidserduke

Message:

Fixed #1959 by postponing ALL script evaluations till the html insertion 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.

Location:

trunk/jquery

Files:

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

trunk/jquery/src/core.js

@@ -495 +495 @@
                     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

trunk/jquery/test/unit/core.js

@@ -1023 +1023 @@
     $("#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 );