Merge branch 'develop'

danielcherubini · danielcherubini · commit f8be1cd5fa41 · 2017-08-19T10:19:28.000+02:00
diff --git a/src/parser/html.js b/src/parser/html.js
@@ -21,9 +21,15 @@ function htmlParser(templateObject: TemplateObjectType, minify: boolean): Promis
                 parsedString = pug.compile(templateObject.content,{})({});
             }
             if (minify) {
-                parsedString = htmlMinify.minify(templateObject.content, {
-                    collapseWhitespace: true
-                });
+                if (parsedString === '') {
+                    parsedString = htmlMinify.minify(templateObject.content, {
+                        collapseWhitespace: true
+                    });
+                } else {
+                    parsedString = htmlMinify.minify(parsedString, {
+                        collapseWhitespace: true
+                    });
+                }
             }
             resolve(parsedString);
         }

Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,15 @@ function htmlParser(templateObject: TemplateObjectType, minify: boolean): Promis`
`21`	`21`	`parsedString = pug.compile(templateObject.content,{})({});`
`22`	`22`	`}`
`23`	`23`	`if (minify) {`
`24`		`- parsedString = htmlMinify.minify(templateObject.content, {`
`25`		`- collapseWhitespace: true`
`26`		`- });`
	`24`	`+ if (parsedString === '') {`
	`25`	`+ parsedString = htmlMinify.minify(templateObject.content, {`
	`26`	`+ collapseWhitespace: true`
	`27`	`+ });`
	`28`	`+ } else {`
	`29`	`+ parsedString = htmlMinify.minify(parsedString, {`
	`30`	`+ collapseWhitespace: true`
	`31`	`+ });`
	`32`	`+ }`
`27`	`33`	`}`
`28`	`34`	`resolve(parsedString);`
`29`	`35`	`}`