From cb18dce10e09453ebe52a44fa4835a5c2a4e70f1 Mon Sep 17 00:00:00 2001
From: Juriy Zaytsev <kangax@gmail.com>
Date: Tue, 9 Mar 2010 09:21:16 -0500
Subject: [PATCH] Fix comments in scripts (forgot that "<!--" strips everything
 till new line; thanks @zoompf for reminder).

---
 src/htmlminifier.js | 10 +++++++---
 tests/index.html    | 21 +++++++++++++++------
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/htmlminifier.js b/src/htmlminifier.js
index 35cfe61..26a88b0 100644
--- a/src/htmlminifier.js
+++ b/src/htmlminifier.js
@@ -103,8 +103,12 @@
       .replace(/(?:\/\*\s*\]\]>\s*\*\/|\/\/\s*\]\]>)\s*$/, '');
   }
   
-  function removeComments(text) {
-    return text.replace(/^\s*<!--/, '').replace(/-->\s*$/, '');
+  var reStartDelimiter = {
+    'script': /^\s*<!--.*\n?/,
+    'style': /^\s*<!--\s*/
+  };
+  function removeComments(text, tag) {
+    return text.replace(reStartDelimiter[tag], '').replace(/\s*-->\s*$/, '');
   }
   
   function isOptionalTag(tag) {
@@ -221,7 +225,7 @@
       chars: function( text ) {
         if (currentTag === 'script' || currentTag === 'style') {
           if (options.removeCommentsFromCDATA) {
-            text = removeComments(text);
+            text = removeComments(text, currentTag);
           }
           if (options.removeCDATASectionsFromCDATA) {
             text = removeCDATASections(text);
diff --git a/tests/index.html b/tests/index.html
index 73ab051..28efcd6 100644
--- a/tests/index.html
+++ b/tests/index.html
@@ -114,20 +114,29 @@
           equals(minify(input, { removeComments: true }), input);
         });
         
-        test('remove comments from scripts/styles', function(){
+        test('remove comments from scripts', function(){
           input = '<script><!--alert(1)--><\/script>';
-          output = '<script>alert(1)<\/script>';
+          output = '<script><\/script>';
           equals(minify(input, { removeCommentsFromCDATA: true }), output);
           
-          input = '<style type="text/css"><!-- p { color: red } --><\/style>';
-          output = '<style type="text/css"> p { color: red } <\/style>';
+          input = '<script><!--alert(1)<\/script>';
+          output = '<script><\/script>';
           equals(minify(input, { removeCommentsFromCDATA: true }), output);
           
-          input = '<script type="text/javascript">  <!-- alert("-->"); -->\n\n   <\/script>';
-          output = '<script type="text/javascript"> alert("-->"); <\/script>';
+          input = '<script type="text/javascript"> <!--\nalert("-->"); -->\n\n   <\/script>';
+          output = '<script type="text/javascript">alert("-->");<\/script>';
           equals(minify(input, { removeCommentsFromCDATA: true }), output);
         });
         
+        test('remove comments from styles', function(){
+          input = '<style type="text/css"><!-- p { color: red } --><\/style>';
+          output = '<style type="text/css">p { color: red }<\/style>';
+          equals(minify(input, { removeCommentsFromCDATA: true }), output);
+          
+          input = '<style type="text/css">p::before { content: "<!--" }<\/style>';
+          equals(minify(input, { removeCommentsFromCDATA: true }), input);
+        });
+        
         test('remove CDATA sections from scripts/styles', function(){
           input = '<script>/*<![CDATA[*/alert(1)/*]]>*/<\/script>';
           output = '<script>alert(1)<\/script>';
-- 
2.34.1