[fix] allow keeping conditionals while removing comments, fixes #34

Swaagie · Mar 7, 2015 · 75e7f28 · 75e7f28
1 parent 574aa5d
commit 75e7f28
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -96,8 +96,9 @@ minimize.parse(
 
 Comments inside HTML are usually beneficial while developing. Hiding your
 comments in production is sane, safe and will reduce data transfer. If you
-ensist on keeping them, for instance to show a nice easter egg, set the option
-to true.
+ensist on keeping them, fo1r instance to show a nice easter egg, set the option
+to true. Keeping comments will also retain any Server Side Includes or
+conditional IE statements.
 
 ```javascript
 var Minimize = require('minimize')

diff --git a/lib/helpers.js b/lib/helpers.js
@@ -249,8 +249,16 @@ Helpers.prototype.text = function text(element) {
 Helpers.prototype.comment = function comment(element) {
   var cfg = this.config;
 
-  if (!(cfg.comments || cfg.conditionals || cfg.ssi)) return '';
-  return '<!--' + compact(element.data, true).trim() + '-->';
+  function io() {
+    return '<!--' + compact(element.data, true).trim() + '-->';
+  }
+
+  if (cfg.ssi && ~element.data.indexOf('#include')) return io();
+  if (cfg.conditionals && (~element.data.indexOf('[if')
+      || ~element.data.indexOf('<![endif'))) return io();
+  if (cfg.comments) return io();
+
+  return '';
 };
 
 /**

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "minimize",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "Minimize HTML",
   "main": "./lib/minimize",
   "bin": {

diff --git a/test/fixtures/html.json b/test/fixtures/html.json
@@ -23,6 +23,7 @@
   "inlineelements": "<form><label>Last:</label>  <input>,  <label>First:</label> <input>  <button>Submit</button></form>",
   "multilineattribs": "<h1 class=\"\n    big\n    title\n\">minimize</h1>",
   "complexconditional": "<head><!--[if lt IE 9]>      <html class=\"no-js lt-ie9\"> <![endif]--><!--[if gt IE 8]><!--> <link rel=\"some.file.com\"> <!--<![endif]--></head>",
+  "conditionalcomments": "<head><!--[if IE 6]>Special instructions for IE 6 here<![endif]--></head><h1><!-- Some comments thats either removed or kept --></h1>",
   "doctype": {
     "data": "!doctype html",
     "type": "directive",

diff --git a/test/minimize-test.js b/test/minimize-test.js
@@ -85,6 +85,14 @@ describe('Minimize', function () {
       });
     });
 
+    it('should be able to remove comments but not conditionals', function (done) {
+      var eitheror = new Minimize({ comments: false, conditionals: true });
+      eitheror.parse(html.conditionalcomments, function (error, result) {
+        expect(result).to.equal('<head><!--[if IE 6]>Special instructions for IE 6 here<![endif]--></head><h1></h1>');
+        done();
+      });
+    });
+
     it('should be configurable to retain server side includes', function (done) {
       var commentable = new Minimize({ ssi: true });
       commentable.parse(html.ssi, function (error, result) {