From 9c98eead07d7e5b41dbd9767e7dcca03f352332f Mon Sep 17 00:00:00 2001
From: alexlamsl <alexlamsl@gmail.com>
Date: Sun, 3 Jul 2016 14:28:27 +0800
Subject: [PATCH] fix interactions between minifyJS and ignoreCustomFragments
 fixes #679

---
 src/htmlminifier.js | 11 ++++++++++-
 tests/minifier.js   | 40 +++++++++++++++++++++-------------------
 2 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/src/htmlminifier.js b/src/htmlminifier.js
index 4bf2908..f25b1d0 100644
--- a/src/htmlminifier.js
+++ b/src/htmlminifier.js
@@ -722,7 +722,7 @@ function processOptions(options) {
 function uniqueId(value) {
   var id;
   do {
-    id = Math.random().toString(36).slice(2);
+    id = Math.random().toString(36).replace(/^0\.[0-9]*/, '');
   } while (~value.indexOf(id));
   return id;
 }
@@ -869,6 +869,15 @@ function minify(value, options, partialMarkup) {
             });
           };
         }
+        var minifyJS = options.minifyJS;
+        if (minifyJS) {
+          var pattern = new RegExp('(\\\\t|)' + uidAttr + '([0-9]+)(\\\\t|)', 'g');
+          options.minifyJS = function(text, inline) {
+            return minifyJS(text, inline).replace(pattern, function(match, prefix, index, suffix) {
+              return (prefix && '\t') + uidAttr + index + (suffix && '\t');
+            });
+          };
+        }
       }
       var token = uidAttr + ignoredCustomMarkupChunks.length;
       ignoredCustomMarkupChunks.push(match);
diff --git a/tests/minifier.js b/tests/minifier.js
index df8bcea..5df325c 100644
--- a/tests/minifier.js
+++ b/tests/minifier.js
@@ -1864,95 +1864,97 @@ QUnit.test('minification of scripts with different mimetypes', function(assert)
 
   input = '<script type="">function f(){  return 1  }</script>';
   output = '<script type="">function f(){return 1}</script>';
-
   assert.equal(minify(input, { minifyJS: true }), output);
 
   input = '<script type="text/javascript">function f(){  return 1  }</script>';
   output = '<script type="text/javascript">function f(){return 1}</script>';
-
   assert.equal(minify(input, { minifyJS: true }), output);
 
   input = '<script foo="bar">function f(){  return 1  }</script>';
   output = '<script foo="bar">function f(){return 1}</script>';
-
   assert.equal(minify(input, { minifyJS: true }), output);
 
   input = '<script type="text/ecmascript">function f(){  return 1  }</script>';
   output = '<script type="text/ecmascript">function f(){return 1}</script>';
-
   assert.equal(minify(input, { minifyJS: true }), output);
 
   input = '<script type="application/javascript">function f(){  return 1  }</script>';
   output = '<script type="application/javascript">function f(){return 1}</script>';
-
   assert.equal(minify(input, { minifyJS: true }), output);
 
   input = '<script type="boo">function f(){  return 1  }</script>';
-
   assert.equal(minify(input, { minifyJS: true }), input);
 
   input = '<script type="text/html"><!-- ko if: true -->\n\n\n<div></div>\n\n\n<!-- /ko --></script>';
+  assert.equal(minify(input, { minifyJS: true }), input);
 
+  input = '<script type=""><?php ?></script>';
   assert.equal(minify(input, { minifyJS: true }), input);
+
+  input = '<script type="">function f(){  return <?php ?>  }</script>';
+  output = '<script type="">function f(){return <?php ?>  }</script>';
+  assert.equal(minify(input, { minifyJS: true }), output);
+
+  input = '<script type="">function f(){  return "<?php ?>"  }</script>';
+  output = '<script type="">function f(){return"<?php ?>"}</script>';
+  assert.equal(minify(input, { minifyJS: true }), output);
 });
 
 QUnit.test('event minification', function(assert) {
   var input, output;
 
   input = '<div only="alert(a + b)" one=";return false;"></div>';
-
   assert.equal(minify(input, { minifyJS: true }), input);
 
   input = '<div onclick="alert(a + b)"></div>';
   output = '<div onclick="alert(a+b)"></div>';
-
   assert.equal(minify(input, { minifyJS: true }), output);
 
   input = '<a href="/" onclick="this.href = getUpdatedURL (this.href);return true;">test</a>';
   output = '<a href="/" onclick="return this.href=getUpdatedURL(this.href),!0">test</a>';
-
   assert.equal(minify(input, { minifyJS: true }), output);
 
   input = '<a onclick="try{ dcsMultiTrack(\'DCS.dcsuri\',\'USPS\',\'WT.ti\') }catch(e){}"> foobar</a>';
   output = '<a onclick=\'try{dcsMultiTrack("DCS.dcsuri","USPS","WT.ti")}catch(e){}\'> foobar</a>';
-
   assert.equal(minify(input, { minifyJS: { mangle: false } }), output);
   assert.equal(minify(input, { minifyJS: { mangle: false }, quoteCharacter: '\'' }), output);
 
   input = '<a onclick="try{ dcsMultiTrack(\'DCS.dcsuri\',\'USPS\',\'WT.ti\') }catch(e){}"> foobar</a>';
   output = '<a onclick="try{dcsMultiTrack(&#34;DCS.dcsuri&#34;,&#34;USPS&#34;,&#34;WT.ti&#34;)}catch(e){}"> foobar</a>';
-
   assert.equal(minify(input, { minifyJS: { mangle: false }, quoteCharacter: '"' }), output);
 
   input = '<a onClick="_gaq.push([\'_trackEvent\', \'FGF\', \'banner_click\']);"></a>';
   output = '<a onclick=\'_gaq.push(["_trackEvent","FGF","banner_click"])\'></a>';
-
   assert.equal(minify(input, { minifyJS: true }), output);
   assert.equal(minify(input, { minifyJS: true, quoteCharacter: '\'' }), output);
 
   input = '<a onClick="_gaq.push([\'_trackEvent\', \'FGF\', \'banner_click\']);"></a>';
   output = '<a onclick="_gaq.push([&#34;_trackEvent&#34;,&#34;FGF&#34;,&#34;banner_click&#34;])"></a>';
-
   assert.equal(minify(input, { minifyJS: true, quoteCharacter: '"' }), output);
 
   input = '<button type="button" onclick=";return false;" id="appbar-guide-button"></button>';
   output = '<button type="button" onclick="return!1" id="appbar-guide-button"></button>';
-
   assert.equal(minify(input, { minifyJS: true }), output);
 
   input = '<button type="button" onclick=";return false;" ng-click="a(1 + 2)" data-click="a(1 + 2)"></button>';
   output = '<button type="button" onclick="return!1" ng-click="a(1 + 2)" data-click="a(1 + 2)"></button>';
-
   assert.equal(minify(input, { minifyJS: true }), output);
   assert.equal(minify(input, { minifyJS: true, customEventAttributes: [] }), input);
-
   output = '<button type="button" onclick=";return false;" ng-click="a(3)" data-click="a(1 + 2)"></button>';
-
   assert.equal(minify(input, { minifyJS: true, customEventAttributes: [/^ng-/] }), output);
-
   output = '<button type="button" onclick="return!1" ng-click="a(3)" data-click="a(1 + 2)"></button>';
-
   assert.equal(minify(input, { minifyJS: true, customEventAttributes: [/^on/, /^ng-/] }), output);
+
+  input = '<div onclick="<?= b ?>"></div>';
+  assert.equal(minify(input, { minifyJS: true }), input);
+
+  input = '<div onclick="alert(a + <?= b ?>)"></div>';
+  output = '<div onclick="alert(a+ <?= b ?>)"></div>';
+  assert.equal(minify(input, { minifyJS: true }), output);
+
+  input = '<div onclick="alert(a + \'<?= b ?>\')"></div>';
+  output = '<div onclick=\'alert(a+"<?= b ?>")\'></div>';
+  assert.equal(minify(input, { minifyJS: true }), output);
 });
 
 QUnit.test('escaping closing script tag', function(assert) {
-- 
2.34.1