From 945a4d8984ac9e464d62d529c17b7a2389017e92 Mon Sep 17 00:00:00 2001
From: Juriy Zaytsev <kangax@gmail.com>
Date: Fri, 19 Mar 2010 16:07:15 -0400
Subject: [PATCH] =?utf8?q?Add=20new=20option=20=E2=80=94=20"removeScriptTy?=
 =?utf8?q?peAttribute",=20which=20removes=20`type=3D"text/javascript"`=20f?=
 =?utf8?q?rom=20script=20elements=20(=C3=A0=20la=20HTML5).=20This=20optimi?=
 =?utf8?q?zation=20is=20currently=20marked=20as=20unsafe.=20Bump=20version?=
 =?utf8?q?=20to=200.41.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 index.html          | 14 ++++++++++++--
 master.css          |  4 +++-
 master.js           |  5 ++++-
 src/htmlminifier.js | 17 ++++++++++++++---
 tests/index.html    | 23 +++++++++++++++++++++++
 5 files changed, 56 insertions(+), 7 deletions(-)

diff --git a/index.html b/index.html
index e5ca648..5668fdb 100644
--- a/index.html
+++ b/index.html
@@ -10,7 +10,7 @@
     <div>
       <div id="outer-wrapper">
         <div id="wrapper">
-          <h1>HTML Minifier <span style="font-size:0.6em">(ver. 0.4)</span></h1>
+          <h1>HTML Minifier <span style="font-size:0.6em">(ver. 0.41)</span></h1>
           <p id="warning">
             Minifier is <strong>very draft</strong> and is <strong>not yet thoroughly tested</strong>. Use at your own risk. 
           </p>
@@ -110,7 +110,7 @@
             </li>
             <li>
               <input type="checkbox" id="remove-empty-elements">
-              <label for="remove-empty-elements">
+              <label for="remove-empty-elements" class="unsafe">
                 Remove empty elements
                 <br>
                 <span class="quiet short">
@@ -118,6 +118,16 @@
                 </span>
               </label>
             </li>
+            <li>
+              <input type="checkbox" id="remove-script-type-attributes">
+              <label for="remove-script-type-attributes" class="unsafe">
+                Remove <code>type="text/javascript"</code> from <code>script</code>'s
+                <br>
+                <span class="quiet short">
+                  Values other than "text/javascript" (e.g. "text/vbscript") are left intact.
+                </span>
+              </label>
+            </li>
             <li>
               <input type="checkbox" id="use-htmllint" checked>
               <label for="use-htmllint">
diff --git a/master.css b/master.css
index 00ba40e..08caaa5 100644
--- a/master.css
+++ b/master.css
@@ -30,4 +30,6 @@ button { font-weight: bold; width: 100px; }
 .controls a:focus, .controls a:hover { text-decoration: none; }
 
 .deprecated-element, .deprecated-attribute { color: red; }
-.presentational-element, .presentational-attribute, .inaccessible-attribute { color: #FF8C00; }
\ No newline at end of file
+.presentational-element, .presentational-attribute, .inaccessible-attribute { color: #FF8C00; }
+
+.unsafe { color: #f33; }
\ No newline at end of file
diff --git a/master.js b/master.js
index b1f657a..45c39f1 100644
--- a/master.js
+++ b/master.js
@@ -21,6 +21,7 @@
       removeEmptyAttributes:        byId('remove-empty-attributes').checked,
       removeEmptyElements:          byId('remove-empty-elements').checked,
       removeOptionalTags:           byId('remove-optional-tags').checked,
+      removeScriptTypeAttributes:   byId('remove-script-type-attributes').checked,
       lint:                         byId('use-htmllint').checked ? new HTMLLint() : null
     };
   }
@@ -79,7 +80,9 @@
   
   byId('select-safe').onclick = function() {
     setCheckedAttrOnCheckboxes(true);
-    byId('options').getElementsByTagName('input')[10].checked = false;
+    var inputEls = byId('options').getElementsByTagName('input');
+    inputEls[10].checked = false;
+    inputEls[11].checked = false;
     return false;
   };
   
diff --git a/src/htmlminifier.js b/src/htmlminifier.js
index 031b617..867457e 100644
--- a/src/htmlminifier.js
+++ b/src/htmlminifier.js
@@ -1,5 +1,5 @@
 /*!
- * HTMLMinifier v0.4
+ * HTMLMinifier v0.41
  * http://kangax.github.com/html-minifier/
  *
  * Copyright (c) 2010 Juriy "kangax" Zaytsev
@@ -85,6 +85,14 @@
     );
   }
   
+  function isScriptTypeAttribute(tag, attrName, attrValue) {
+    return (
+      tag === 'script' && 
+      attrName === 'type' && 
+      trimWhitespace(attrValue.toLowerCase()) === 'text/javascript'
+    );
+  }
+  
   function isBooleanAttribute(attrName) {
     return (/^(?:checked|disabled|selected|readonly)$/).test(attrName);
   }
@@ -195,8 +203,11 @@
         attrValue = attr.escaped,
         attrFragment;
     
-    if (options.removeRedundantAttributes && 
-        isAttributeRedundant(tag, attrName, attrValue, attrs)) {
+    if ((options.removeRedundantAttributes && 
+      isAttributeRedundant(tag, attrName, attrValue, attrs)) 
+      ||
+      (options.removeScriptTypeAttributes && 
+      isScriptTypeAttribute(tag, attrName, attrValue))) {
       return '';
     }
     
diff --git a/tests/index.html b/tests/index.html
index 818f492..4df5676 100644
--- a/tests/index.html
+++ b/tests/index.html
@@ -378,6 +378,29 @@
           equals(minify(input, { cleanAttributes: true }), input);
         });
         
+        test('removing type="text/javascript" attributes', function(){
+          input = '<script type="text/javascript">alert(1)<\/script>';
+          output = '<script>alert(1)<\/script>';
+          
+          equals(minify(input, { removeScriptTypeAttributes: true }), output);
+          equals(minify(input, { removeScriptTypeAttributes: false }), input);
+          
+          input = '<SCRIPT TYPE="  text/javascript ">alert(1)<\/script>';
+          output = '<script>alert(1)<\/script>';
+          
+          equals(minify(input, { removeScriptTypeAttributes: true }), output);
+          
+          input = '<script type="application/javascript;version=1.8">alert(1)<\/script>';
+          output = '<script type="application/javascript;version=1.8">alert(1)<\/script>';
+          
+          equals(minify(input, { removeScriptTypeAttributes: true }), output);
+          
+          input = '<script type="text/vbscript">MsgBox("foo bar")<\/script>';
+          output = '<script type="text/vbscript">MsgBox("foo bar")<\/script>';
+          
+          equals(minify(input, { removeScriptTypeAttributes: true }), output);
+        });
+        
         test('removing attribute quotes', function(){
           input = '<p title="blah" class="a23B-foo.bar_baz:qux" id="moo">foo</p>';
           equals(minify(input, { removeAttributeQuotes: true }), '<p title=blah class=a23B-foo.bar_baz:qux id=moo>foo</p>');
-- 
2.34.1