add customFragmentsInScripts option

kangax · Sep 18, 2016 · 647b148 · 647b148
1 parent 89c2968
commit 647b148
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/dist/htmlminifier.js b/dist/htmlminifier.js
@@ -34008,6 +34008,11 @@ function minify(value, options, partialMarkup) {
         if (minifyJS) {
           var pattern = new RegExp('(\\\\t|)' + uidAttr + '([0-9]+)(\\\\t|)', 'g');
           options.minifyJS = function(text, inline) {
+            if (options.customFragmentsInScripts === false) {
+              text = text.replace(uidPattern, function(match, prefix, index) {
+                return ignoredCustomMarkupChunks[index];
+              });
+            }
             return minifyJS(text, inline).replace(pattern, function(match, prefix, index, suffix) {
               return (prefix && '\t') + uidAttr + index + (suffix && '\t');
             });

diff --git a/dist/htmlminifier.min.js b/dist/htmlminifier.min.js
diff --git a/src/htmlminifier.js b/src/htmlminifier.js
@@ -880,6 +880,11 @@ function minify(value, options, partialMarkup) {
         if (minifyJS) {
           var pattern = new RegExp('(\\\\t|)' + uidAttr + '([0-9]+)(\\\\t|)', 'g');
           options.minifyJS = function(text, inline) {
+            if (options.customFragmentsInScripts === false) {
+              text = text.replace(uidPattern, function(match, prefix, index) {
+                return ignoredCustomMarkupChunks[index];
+              });
+            }
             return minifyJS(text, inline).replace(pattern, function(match, prefix, index, suffix) {
               return (prefix && '\t') + uidAttr + index + (suffix && '\t');
             });

diff --git a/tests/minifier.js b/tests/minifier.js
@@ -1746,6 +1746,9 @@ QUnit.test('Ignore custom fragments', function(assert) {
       /\{\{.*?\}\}/g
     ]
   }), output);
+
+  input = '<script>(function() { window.global = 1; <% ... %>; b() <% ... %> })()</script>';
+  assert.equal(minify(input, { minifyJS: true, customFragmentsInScripts: false }), input);
 });
 
 QUnit.test('bootstrap\'s span > button > span', function(assert) {