archive-gh-me/marko
1
0
Fork 0
mirror of https://github.com/marko-js/marko.git synced 2025-12-08 19:26:05 +00:00
Code Issues Projects Releases Wiki Activity

Fixes #204 - preserve whitespace for script, textarea and pre

Browse Source
This commit is contained in:
Patrick Steele-Idem 2016-01-14 10:13:47 -07:00
parent bb89e627b0
commit e218cf876c
19 changed files with 83 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
compiler/ast/Text.js
View File

@ -70,6 +70,11 @@ class Text extends Node {
return; return;
} }
var parentNode = this.parentNode;
if (parentNode && parentNode.tagDef && parentNode.tagDef.preserveWhitespace) {
return;
}
var container = this.container; var container = this.container;
if (!container) { if (!container) {
return; return;

9
taglibs/core/marko-taglib.json
View File

@ -23,10 +23,19 @@
"<macro-body>": { "<macro-body>": {
"code-generator": "./macro-body-tag" "code-generator": "./macro-body-tag"
}, },
"<pre>": {
"preserve-whitespace": true
},
"<script>": {
"preserve-whitespace": true
},
"<template-init>": { "<template-init>": {
"code-generator": "./template-init-tag", "code-generator": "./template-init-tag",
"body": "static-text" "body": "static-text"
}, },
"<textarea>": {
"preserve-whitespace": true
},
"<unless>": { "<unless>": {
"node-factory": "./unless-tag" "node-factory": "./unless-tag"
}, },

5
test/fixtures/render/autotest-pending/inline-script/expected.html vendored
View File

@ -1,5 +0,0 @@
<html><head><title>Optimizer: Server Includes</title></head><body>Hello World! <script>
$(function() {
alert('test');
})
</script></body></html>

15
test/fixtures/render/autotest-pending/inline-script/template.marko vendored
View File

@ -1,15 +0,0 @@
<var name="name" value="data.name"/>
<html>
<head>
<title>Optimizer: Server Includes</title>
</head>
<body>
Hello $name!
<script>
$(function() {
alert('test');
})
</script>
</body>
</html>

6
test/fixtures/render/autotest/inline-script/expected.html vendored Normal file
View File

@ -0,0 +1,6 @@
<html><head><title>Inline Script</title></head><body>Hello name! <script type="text/javascript">
<div if(foo)></div>
$(function() {
alert('World');
})
</script></body></html>

17
test/fixtures/render/autotest/inline-script/template.marko vendored Normal file
View File

@ -0,0 +1,17 @@
<var name="name" value="data.name"/>
<html>
<head>
<title>Inline Script</title>
</head>
<body>
Hello ${name}!
<script type="text/javascript">
<div if(foo)></div>
$(function() {
alert('${data.name}');
})
</script>
</body>
</html>

0
test/fixtures/render/autotest-pending/inline-script/test.js → test/fixtures/render/autotest/inline-script/test.js vendored
View File

4
test/fixtures/render/autotest/whitespace-pre/expected.html vendored Normal file
View File

@ -0,0 +1,4 @@
<pre>
Hello
World
</pre>

4
test/fixtures/render/autotest/whitespace-pre/template.marko vendored Normal file
View File

@ -0,0 +1,4 @@
<pre>
Hello
World
</pre>

3
test/fixtures/render/autotest/whitespace-pre/test.js vendored Normal file
View File

@ -0,0 +1,3 @@
exports.templateData = {
"name": "World"
};

5
test/fixtures/render/autotest/whitespace-script/expected.html vendored Normal file
View File

@ -0,0 +1,5 @@
<script>
$(function() {
alert('test');
})
</script>

5
test/fixtures/render/autotest/whitespace-script/template.marko vendored Normal file
View File

@ -0,0 +1,5 @@
<script>
$(function() {
alert('test');
})
</script>

3
test/fixtures/render/autotest/whitespace-script/test.js vendored Normal file
View File

@ -0,0 +1,3 @@
exports.templateData = {
"name": "World"
};

4
test/fixtures/render/autotest/whitespace-textarea-capitalized/expected.html vendored Normal file
View File

@ -0,0 +1,4 @@
<TEXTAREA>
Hello
World
</TEXTAREA>

4
test/fixtures/render/autotest/whitespace-textarea-capitalized/template.marko vendored Normal file
View File

@ -0,0 +1,4 @@
<TEXTAREA>
Hello
World
</TEXTAREA>

3
test/fixtures/render/autotest/whitespace-textarea-capitalized/test.js vendored Normal file
View File

@ -0,0 +1,3 @@
exports.templateData = {
"name": "World"
};

4
test/fixtures/render/autotest/whitespace-textarea/expected.html vendored Normal file
View File

@ -0,0 +1,4 @@
<textarea>
Hello
World
</textarea>

4
test/fixtures/render/autotest/whitespace-textarea/template.marko vendored Normal file
View File

@ -0,0 +1,4 @@
<textarea>
Hello
World
</textarea>

3
test/fixtures/render/autotest/whitespace-textarea/test.js vendored Normal file
View File

@ -0,0 +1,3 @@
exports.templateData = {
"name": "World"
};