Slight optimization to `trimWhitespace`. Fix bug with `removeEmptyElements` cutting...

diff --git a/src/htmlminifier.js b/src/htmlminifier.js
index 2276f80..d1c0f7b 100644 (file)
--- a/src/htmlminifier.js
+++ b/src/htmlminifier.js
@@ -21,7 +21,12 @@
   }
   
   function trimWhitespace(str) {
-    return (str.trim ? str.trim() : str.replace(/^\s+/, '').replace(/\s+$/, ''));
+    return str.replace(/^\s+/, '').replace(/\s+$/, '');
+  }
+  if (String.prototype.trim) {
+    trimWhitespace = function(str) {
+      return str.trim();
+    };
   }
   
   function collapseWhitespace(str) {
@@ -183,6 +188,7 @@
         
         tag = tag.toLowerCase();
         currentTag = tag;
+        currentChars = '';
         
         buffer.push('<', tag);
         
@@ -195,14 +201,20 @@
       },
       end: function( tag ) {
         var isElementEmpty = currentChars === '' && tag === currentTag;
-        if ((options.removeEmptyElements && isElementEmpty && canRemoveElement(tag)) ||
-            (options.removeOptionalTags && isOptionalTag(tag))) {
-          // noop
+        if ((options.removeEmptyElements && isElementEmpty && canRemoveElement(tag))) {
+          // remove last "element" from buffer, return
+          buffer.splice(buffer.lastIndexOf('<'));
+          return;
+        }
+        else if (options.removeOptionalTags && isOptionalTag(tag)) {
+          // noop, leave start tag in buffer
         }
         else {
+          // push end tag to buffer
           buffer.push('</', tag.toLowerCase(), '>');
           results.push.apply(results, buffer);
         }
+        // flush buffer
         buffer.length = 0;
         currentChars = '';
       },

diff --git a/tests/index.html b/tests/index.html
index ed95793..9cf97eb 100644 (file)
--- a/tests/index.html
+++ b/tests/index.html
@@ -301,6 +301,7 @@
         });
         
         test('removing empty elements', function() {
+          
           equals(minify('<p>x</p>', { removeEmptyElements: true }), '<p>x</p>');
           equals(minify('<p></p>', { removeEmptyElements: true }), '');
           
@@ -319,6 +320,21 @@
           input = '<div>hello<span>world</span></div>';
           output = '<div>hello<span>world</span></div>';
           equals(minify(input, { removeEmptyElements: true }), output);
+          
+          input = '<p>x<span title="<" class="blah-moo"></span></p>';
+          output = '<p>x</p>';
+          equals(minify(input, { removeEmptyElements: true }), output);
+          
+          input = '<div>x<div>y <div>blah</div><div></div>foo</div>z</div>';
+          output = '<div>x<div>y <div>blah</div>foo</div>z</div>';
+          equals(minify(input, { removeEmptyElements: true }), output);
+          
+          input = '<img src="">';
+          equals(minify(input, { removeEmptyElements: true }), input);
+          
+          input = '<p><!-- x --></p>';
+          output = '';
+          equals(minify(input, { removeEmptyElements: true }), output);
         });
         
         test('collapsing boolean attributes', function(){