From: John Resig <jeresig@gmail.com>
Date: Sun, 11 Jan 2009 19:33:01 +0000 (+0000)
Subject: Prevented non-script <script> blocks from executing, fixing #3733.
X-Git-Url: http://git.asbjorn.it/?a=commitdiff_plain;h=73ff49ac9a3a6d049557394062e3ad915bb04ef1;p=jquery.git

Prevented non-script <script> blocks from executing, fixing #3733.
---

diff --git a/src/core.js b/src/core.js
index 78f2bcd..493a655 100644
--- a/src/core.js
+++ b/src/core.js
@@ -923,7 +923,7 @@ jQuery.extend({
 
 		if ( fragment ) {
 			for ( var i = 0; ret[i]; i++ ) {
-				if ( jQuery.nodeName( ret[i], "script" ) ) {
+				if ( jQuery.nodeName( ret[i], "script" ) && (!ret[i].type || ret[i].type === "text/javascript") ) {
 					scripts.push( ret[i].parentNode ? ret[i].parentNode.removeChild( ret[i] ) : ret[i] );
 				} else {
 					if ( ret[i].nodeType === 1 )
diff --git a/test/unit/core.js b/test/unit/core.js
index 494917e..4d04af7 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -1352,7 +1352,7 @@ test("val(String/Number)", function() {
 });
 
 test("html(String)", function() {
-	expect(13);
+	expect(17);
 	
 	jQuery.scriptorder = 0;
 	
@@ -1381,6 +1381,10 @@ test("html(String)", function() {
 	equals( $div.html( 5 ).html(), '5', 'Setting a number as html' );
 	equals( $div.html( 0 ).html(), '0', 'Setting a zero as html' );
 
+	reset();
+
+	jQuery("#main").html('<script type="something/else">ok( false, "Non-script evaluated." );</script><script type="text/javascript">ok( true, "text/javascript is evaluated." );</script><script>ok( true, "No type is evaluated." );</script><div><script type="text/javascript">ok( true, "Inner text/javascript is evaluated." );</script><script>ok( true, "Inner No type is evaluated." );</script><script type="something/else">ok( false, "Non-script evaluated." );</script></div>');
+
 	stop();
 
 	jQuery("#main").html('<script type="text/javascript">ok( true, "jQuery().html().evalScripts() Evals Scripts Twice in Firefox, see #975" );</script>');