From 9ea8017f86c48ab624fbdc0e55a79110d9c61a9f Mon Sep 17 00:00:00 2001
From: David Serduke <davidserduke@gmail.com>
Date: Mon, 10 Dec 2007 19:04:59 +0000
Subject: [PATCH] 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.

---
 src/core.js       | 11 ++---------
 test/unit/core.js |  3 ++-
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/core.js b/src/core.js
index 39ffdb58..582e53e7 100644
--- a/src/core.js
+++ b/src/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 )
diff --git a/test/unit/core.js b/test/unit/core.js
index 533fcef2..3aa66b32 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -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 );
 });