Merge pull request #468 from soenkeschnoor/incompatible-handlebar-syntax

Ignore html script and style tags with unexpdcted type attributes Fixes #453
beautifier · May 21, 2014 · 9d0ecf8 · 9d0ecf8
2 parents 3d611fc + ff7d3bb
commit 9d0ecf8
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 3 deletions.
diff --git a/js/lib/beautify-html.js b/js/lib/beautify-html.js
@@ -405,12 +405,16 @@
                         this.indent_content = true;
                         this.traverse_whitespace();
                     }
-                } else if (tag_check === 'script') { //for later script handling
+                } else if (tag_check === 'script' && 
+                    (tag_complete.search('type') === -1 || 
+                    (tag_complete.search('type') > -1 && tag_complete.search('text/javascript') > -1))) {
                     if (!peek) {
                         this.record_tag(tag_check);
                         this.tag_type = 'SCRIPT';
                     }
-                } else if (tag_check === 'style') { //for future style handling (for now it justs uses get_content)
+                } else if (tag_check === 'style' && 
+                    (tag_complete.search('type') === -1 || 
+                    (tag_complete.search('type') > -1 && tag_complete.search('text/css') > -1))) {
                     if (!peek) {
                         this.record_tag(tag_check);
                         this.tag_type = 'STYLE';

diff --git a/js/test/beautify-tests.js b/js/test/beautify-tests.js
@@ -1701,7 +1701,55 @@ function run_beautifier_tests(test_obj, Urlencoded, js_beautify, html_beautify,
             '<li>\n' +
             '    content\n' +
             '</li>');
-
+
+		// START tests for issue 453
+		bth('<script type="text/unknown"><div></div></script>', 
+			'<script type="text/unknown">\n' + 
+			'    <div></div>\n' + 
+			'</script>');
+		bth('<script type="text/javascript"><div></div></script>', 
+			'<script type="text/javascript">\n' + 
+			'    < div > < /div>\n' + 
+			'</script>');
+		bth('<script><div></div></script>', 
+			'<script>\n' + 
+			'    < div > < /div>\n' + 
+			'</script>');
+		bth('<script type="text/javascript">var foo = "bar";</script>', 
+			'<script type="text/javascript">\n' + 
+			'    var foo = "bar";\n' + 
+			'</script>');			
+		bth('<script>var foo = "bar";</script>', 
+			'<script>\n' + 
+			'    var foo = "bar";\n' + 
+			'</script>');					
+
+		bth('<style type="text/unknown"><tag></tag></style>', 
+			'<style type="text/unknown">\n' + 
+			'    <tag></tag>\n' + 
+			'</style>');	
+		bth('<style type="text/css"><tag></tag></style>', 
+			'<style type="text/css">\n' + 
+			'    <tag></tag>\n' + 
+			'</style>');		
+		bth('<style><tag></tag></style>', 
+			'<style>\n' + 
+			'    <tag></tag>\n' + 
+			'</style>');				
+		bth('<style type="text/css">.selector {font-size:12px;}</style>', 
+			'<style type="text/css">\n' + 
+			'    .selector {\n' +
+			'        font-size: 12px;\n' + 
+			'    }\n'+ 
+			'</style>');
+		bth('<style>.selector {font-size:12px;}</style>', 
+			'<style>\n' + 
+			'    .selector {\n' +
+			'        font-size: 12px;\n' + 
+			'    }\n'+ 
+			'</style>');			
+		// END tests for issue 453
+
         // Tests that don't pass, but probably should.
         // bth('<div><span>content</span></div>');