Whitespace after textarea/pre patch

Fix for issue #77 with collapseWhitespace tests.

diff --git a/dist/all.js b/dist/all.js
index c702659..5333f9a 100644 (file)
--- a/dist/all.js
+++ b/dist/all.js
@@ -731,10 +731,10 @@
           }
         }
         if (options.collapseWhitespace) {
-          if (!stackNoTrimWhitespace.length && _canTrimWhitespace(currentTag, currentAttrs)) {
+          if (!stackNoTrimWhitespace.length) {
             text = (prevTag || nextTag) ? collapseWhitespaceSmart(text, prevTag, nextTag) : trimWhitespace(text);
           }
-          if (!stackNoCollapseWhitespace.length && _canCollapseWhitespace(currentTag, currentAttrs)) {
+          if (!stackNoCollapseWhitespace.length) {
             text = collapseWhitespace(text);
           }
         }

diff --git a/src/htmlminifier.js b/src/htmlminifier.js
index bf38f30..acde7dc 100644 (file)
--- a/src/htmlminifier.js
+++ b/src/htmlminifier.js
@@ -387,10 +387,10 @@
           }
         }
         if (options.collapseWhitespace) {
-          if (!stackNoTrimWhitespace.length && _canTrimWhitespace(currentTag, currentAttrs)) {
+          if (!stackNoTrimWhitespace.length) {
             text = (prevTag || nextTag) ? collapseWhitespaceSmart(text, prevTag, nextTag) : trimWhitespace(text);
           }
-          if (!stackNoCollapseWhitespace.length && _canCollapseWhitespace(currentTag, currentAttrs)) {
+          if (!stackNoCollapseWhitespace.length) {
             text = collapseWhitespace(text);
           }
         }

diff --git a/tests/minifier.js b/tests/minifier.js
index 3342c42..8013f55 100644 (file)
--- a/tests/minifier.js
+++ b/tests/minifier.js
@@ -168,17 +168,14 @@
     output = '<!--[if IE 7]>'+
                 '<link rel="stylesheet" href="/css/ie7-fixes.css" type="text/css" />'+
              '<![endif]-->'
-
     equal(minify(input, { removeComments: true }), output);
 
-
     input = '<!--[if lte IE 6]>\n    \n   \n\n\n\t' +
               '<p title=" sigificant     whitespace   ">blah blah</p>' +
             '<![endif]-->';
     output = '<!--[if lte IE 6]>' +
               '<p title=" sigificant     whitespace   ">blah blah</p>' +
             '<![endif]-->';
-
     equal(minify(input, { removeComments: true }), output);
   });
 
@@ -517,6 +514,28 @@
     output = '<div><textarea></textarea></div>';
     equal(minify(input, { collapseWhitespace: true }), output);
 
+    input = '<div><pre> $foo = "baz"; </pre>    </div>';
+    output = '<div><pre> $foo = "baz"; </pre></div>';
+    equal(minify(input, { collapseWhitespace: true }), output);
+
+     input = '<script type=\"text\/javascript\">var = \"hello\";<\/script>\r\n\r\n\r\n'              +
+             '<style type=\"text\/css\">#foo { color: red;        }          <\/style>\r\n\r\n\r\n'  +
+             '<div>\r\n  <div>\r\n    <div><!-- hello -->\r\n      <div>'                            +
+             '<!--! hello -->\r\n        <div>\r\n          <div class=\"\">\r\n\r\n            '    +
+             '<textarea disabled=\"disabled\">     this is a textarea <\/textarea>\r\n          '    +
+             '<\/div>\r\n        <\/div>\r\n      <\/div>\r\n    <\/div>\r\n  <\/div>\r\n<\/div>'    +
+             '<pre>       \r\nxxxx<\/pre><span>x<\/span> <span>Hello<\/span> <b>billy<\/b>     \r\n' +
+             '<input type=\"text\">\r\n<textarea><\/textarea>\r\n<pre><\/pre>';
+    output = '<script type="text/javascript">var = "hello";</script>'                                +
+             '<style type="text/css">#foo { color: red;        }</style>'                            +
+             '<div><div><div>'                                                                       +
+             '<!-- hello --><div><!--! hello --><div><div class="">'                                 +
+             '<textarea disabled="disabled">     this is a textarea </textarea>'                     +
+             '</div></div></div></div></div></div>'                                                  +
+             '<pre>       \r\nxxxx</pre><span>x</span> <span>Hello</span> <b>billy</b>'              +
+             '<input type="text"><textarea></textarea><pre></pre>';
+    equal(minify(input, { collapseWhitespace: true }), output);
+
     input = '<pre title="some title...">   hello     world </pre>';
     output = '<pre title="some title...">   hello     world </pre>';
     equal(minify(input, { collapseWhitespace: true }), output);