Fixes #11402. domManip now also removes the closing part of HTML comm…

…ents or CDATA surrounding executed scripts. Unit tests added.
jquery · a743be19bd3622071c22e9874c92024bc3f5367a · jaubourg committed May 5, 2012 · May 5, 2012 · gnarf · May 6, 2012
1 parent e3cf0e2
commit a743be19bd3622071c22e9874c92024bc3f5367a
Unified Split

Showing with 19 additions and 1 deletion.

+1 −1 src/manipulation.js

+10 −0 test/data/cleanScript.html

+8 −0 test/unit/ajax.js
diff --git a/src/manipulation.js b/src/manipulation.js
@@ -29,7 +29,7 @@ var nodeNames = "abbr|article|aside|audio|bdi|canvas|data|datalist|details|figca
 	// checked="checked" or checked
 	rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
 	rscriptType = /\/(java|ecma)script/i,
-	rcleanScript = /^\s*<!(?:\[CDATA\[|\-\-)/,
+	rcleanScript = /^\s*<!(?:\[CDATA\[|\-\-)|[\]\-]{2}>\s*$/g,
 	wrapMap = {
 		option: [ 1, "<select multiple='multiple'>", "</select>" ],
 		legend: [ 1, "<fieldset>", "</fieldset>" ],
diff --git a/test/data/cleanScript.html b/test/data/cleanScript.html
@@ -0,0 +1,10 @@
+<script>
+<!--
+ok( true, "script within html comments executed" );
+-->
+</script>
+<script>
+<![CDATA[
+ok( true, "script within CDATA executed" );
+]]>
+</script>
diff --git a/test/unit/ajax.js b/test/unit/ajax.js
@@ -2467,6 +2467,14 @@ test( "jQuery.domManip - no side effect because of ajaxSetup or global events (#
 	});
 });
 
+test( "jQuery.domManip - script in comments are properly evaluated (#11402)", function() {
+	expect( 2 );
+	stop();
+	jQuery( "#qunit-fixture" ).load( "data/cleanScript.html", function() {
+		start();
+	});
+});
+
 test("jQuery.ajax - active counter", function() {
     ok( jQuery.active == 0, "ajax active counter should be zero: " + jQuery.active );
 });