Fix regression with htmlmin & HTML5

Gruntfile.js

@@ -80,6 +80,11 @@ module.exports = function(grunt) {
         }
       },
 
+      html5: {
+        src: ['test/fixtures/html5.html'],
+        dest: 'tmp/html5.js'
+      },
+
       // Minify the HTML
       custom_htmlmin: {
         src: ['test/fixtures/one.html', 'test/fixtures/two/**/*.html'],

tasks/lib/compiler.js

@@ -108,7 +108,7 @@ var Compiler = function(grunt, options, cwd) {
    * @return {String}         Minified template
    */
   this.minify = function(source) {
-    if (options.htmlmin) {
+    if (Object.keys(options.htmlmin).length) {
       try {
         source = minify(source, options.htmlmin);
       } catch (err) {

test/angular-templates_test.js

@@ -35,6 +35,16 @@ exports.ngtemplates = {
     test.done();
   },
 
+  html5: function(test) {
+    test.expect(1);
+
+    var actual    = grunt.file.read('tmp/html5.js');
+    var expected  = grunt.file.read('test/expected/html5.js');
+
+    test.equal(expected, actual);
+    test.done();
+  },
+
   custom_htmlmin: function(test) {
     test.expect(1);
 

test/expected/callback_module.js

@@ -9,7 +9,7 @@ angular.module('test.fixtures.one.html').run(['$templateCache', function($templa
     "  // Test\n" +
     "  /* comments */\n" +
     "  var foo = 'bar';\n" +
-    "</script>"
+    "</script>\n"
   );
 
 }]);
@@ -21,7 +21,7 @@ angular.module('test.fixtures.two.two.html').run(['$templateCache', function($te
     "\n" +
     "<!-- Comment for two -->\n" +
     "\n" +
-    "<textarea readonly=\"readonly\">We are two.</textarea>"
+    "<textarea readonly=\"readonly\">We are two.</textarea>\n"
   );
 
 }]);

test/expected/custom_angular.js

@@ -9,7 +9,7 @@ myAngular.module('custom_angular').run(['$templateCache', function($templateCach
     "  // Test\n" +
     "  /* comments */\n" +
     "  var foo = 'bar';\n" +
-    "</script>"
+    "</script>\n"
   );
 
 
@@ -18,7 +18,7 @@ myAngular.module('custom_angular').run(['$templateCache', function($templateCach
     "\n" +
     "<!-- Comment for two -->\n" +
     "\n" +
-    "<textarea readonly=\"readonly\">We are two.</textarea>"
+    "<textarea readonly=\"readonly\">We are two.</textarea>\n"
   );
 
 }]);

test/expected/custom_bootstrap.js

@@ -9,7 +9,7 @@ module.exports = function($templateCache) {
     "  // Test\n" +
     "  /* comments */\n" +
     "  var foo = 'bar';\n" +
-    "</script>"
+    "</script>\n"
   );
 
 
@@ -18,7 +18,7 @@ module.exports = function($templateCache) {
     "\n" +
     "<!-- Comment for two -->\n" +
     "\n" +
-    "<textarea readonly=\"readonly\">We are two.</textarea>"
+    "<textarea readonly=\"readonly\">We are two.</textarea>\n"
   );
 
 };

test/expected/custom_concat.js

@@ -20,7 +20,7 @@ angular.module('custom_concat').run(['$templateCache', function($templateCache)
     "  // Test\n" +
     "  /* comments */\n" +
     "  var foo = 'bar';\n" +
-    "</script>"
+    "</script>\n"
   );
 
 
@@ -29,7 +29,7 @@ angular.module('custom_concat').run(['$templateCache', function($templateCache)
     "\n" +
     "<!-- Comment for two -->\n" +
     "\n" +
-    "<textarea readonly=\"readonly\">We are two.</textarea>"
+    "<textarea readonly=\"readonly\">We are two.</textarea>\n"
   );
 
 }]);

test/expected/custom_module.js

@@ -9,7 +9,7 @@ angular.module('customModule').run(['$templateCache', function($templateCache) {
     "  // Test\n" +
     "  /* comments */\n" +
     "  var foo = 'bar';\n" +
-    "</script>"
+    "</script>\n"
   );
 
 
@@ -18,7 +18,7 @@ angular.module('customModule').run(['$templateCache', function($templateCache) {
     "\n" +
     "<!-- Comment for two -->\n" +
     "\n" +
-    "<textarea readonly=\"readonly\">We are two.</textarea>"
+    "<textarea readonly=\"readonly\">We are two.</textarea>\n"
   );
 
 }]);

test/expected/custom_source.js

@@ -10,7 +10,7 @@ angular.module('custom_source').run(['$templateCache', function($templateCache)
     "  // Test\n" +
     "  /* comments */\n" +
     "  var foo = 'bar';\n" +
-    "</script>"
+    "</script>\n"
   );
 
 
@@ -20,7 +20,7 @@ angular.module('custom_source').run(['$templateCache', function($templateCache)
     "\n" +
     "<!-- Comment for two -->\n" +
     "\n" +
-    "<textarea readonly=\"readonly\">We are two.</textarea>"
+    "<textarea readonly=\"readonly\">We are two.</textarea>\n"
   );
 
 }]);

test/expected/custom_url.js

@@ -9,7 +9,7 @@ angular.module('custom_url').run(['$templateCache', function($templateCache) {
     "  // Test\n" +
     "  /* comments */\n" +
     "  var foo = 'bar';\n" +
-    "</script>"
+    "</script>\n"
   );
 
 
@@ -18,7 +18,7 @@ angular.module('custom_url').run(['$templateCache', function($templateCache) {
     "\n" +
     "<!-- Comment for two -->\n" +
     "\n" +
-    "<textarea readonly=\"readonly\">We are two.</textarea>"
+    "<textarea readonly=\"readonly\">We are two.</textarea>\n"
   );
 
 }]);

test/expected/default_module.js

@@ -9,7 +9,7 @@ angular.module('default_module').run(['$templateCache', function($templateCache)
     "  // Test\n" +
     "  /* comments */\n" +
     "  var foo = 'bar';\n" +
-    "</script>"
+    "</script>\n"
   );
 
 
@@ -18,7 +18,7 @@ angular.module('default_module').run(['$templateCache', function($templateCache)
     "\n" +
     "<!-- Comment for two -->\n" +
     "\n" +
-    "<textarea readonly=\"readonly\">We are two.</textarea>"
+    "<textarea readonly=\"readonly\">We are two.</textarea>\n"
   );
 
 }]);

test/expected/full_url.js

@@ -9,7 +9,7 @@ angular.module('full_url').run(['$templateCache', function($templateCache) {
     "  // Test\n" +
     "  /* comments */\n" +
     "  var foo = 'bar';\n" +
-    "</script>"
+    "</script>\n"
   );
 
 
@@ -18,7 +18,7 @@ angular.module('full_url').run(['$templateCache', function($templateCache) {
     "\n" +
     "<!-- Comment for two -->\n" +
     "\n" +
-    "<textarea readonly=\"readonly\">We are two.</textarea>"
+    "<textarea readonly=\"readonly\">We are two.</textarea>\n"
   );
 
 }]);

test/expected/html5.js

@@ -0,0 +1,19 @@
+angular.module('html5').run(['$templateCache', function($templateCache) {
+
+  $templateCache.put('test/fixtures/html5.html',
+    "<div>\n" +
+    "    <span>\n" +
+    "        Self-closing, sucka!\n" +
+    "        <br>\n" +
+    "        <img src='path/to/img'>\n" +
+    "</div>\n" +
+    "\n" +
+    "<hr>\n" +
+    "\n" +
+    "<table>\n" +
+    "    <tr>\n" +
+    "        <td>\n" +
+    "            Howdy\n"
+  );
+
+}]);

test/expected/relative_url.js

@@ -9,7 +9,7 @@ angular.module('relative_url').run(['$templateCache', function($templateCache) {
     "  // Test\n" +
     "  /* comments */\n" +
     "  var foo = 'bar';\n" +
-    "</script>"
+    "</script>\n"
   );
 
 
@@ -18,7 +18,7 @@ angular.module('relative_url').run(['$templateCache', function($templateCache) {
     "\n" +
     "<!-- Comment for two -->\n" +
     "\n" +
-    "<textarea readonly=\"readonly\">We are two.</textarea>"
+    "<textarea readonly=\"readonly\">We are two.</textarea>\n"
   );
 
 }]);

test/expected/standalone.js

@@ -9,7 +9,7 @@ angular.module('standalone', []).run(['$templateCache', function($templateCache)
     "  // Test\n" +
     "  /* comments */\n" +
     "  var foo = 'bar';\n" +
-    "</script>"
+    "</script>\n"
   );
 
 
@@ -18,7 +18,7 @@ angular.module('standalone', []).run(['$templateCache', function($templateCache)
     "\n" +
     "<!-- Comment for two -->\n" +
     "\n" +
-    "<textarea readonly=\"readonly\">We are two.</textarea>"
+    "<textarea readonly=\"readonly\">We are two.</textarea>\n"
   );
 
 }]);

test/expected/undefined_file.js

@@ -9,7 +9,7 @@ angular.module('undefined_file').run(['$templateCache', function($templateCache)
     "  // Test\n" +
     "  /* comments */\n" +
     "  var foo = 'bar';\n" +
-    "</script>"
+    "</script>\n"
   );
 
 }]);

test/fixtures/html5.html

@@ -0,0 +1,13 @@
+<div>
+    <span>
+        Self-closing, sucka!
+        <br>
+        <img src='path/to/img'>
+</div>
+
+<hr>
+
+<table>
+    <tr>
+        <td>
+            Howdy