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 #161 - Nested tags with no body content are not handled correctly

Browse Source
This commit is contained in:
Patrick Steele-Idem 2015-11-10 10:21:02 -07:00
parent 4b02418079
commit d60289c50f
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
taglibs/core/TagHandlerNode.js
View File

@ -267,7 +267,10 @@ TagHandlerNode.prototype = {
var hasOutParam = false;
var hasBodyFunc = false;
if (_this.hasChildren() && !tag.bodyFunction) {
hasBodyFunc = true;
var bodyParams = [];
@ -296,6 +299,9 @@ TagHandlerNode.prototype = {
}
if (hasNestedTags || isNestedTag || hasOutParam) {
if (!hasBodyFunc) {
template.code(',null');
}
var options = [];
if (hasNestedTags) {

2
test/fixtures/templates/nested-tags-empty-body/expected.html vendored
View File

@ -1 +1 @@
<div class="tabs"><ul><li>Tab 1</li><li>Tab 3</li></ul><div class="tab-content"><div class="tab">Tab 1 content</div><div class="tab">Tab 3 content</div></div></div>
<div class="tabs"><ul><li>Tab 1</li><li>Tab 2</li><li>Tab 3</li></ul><div class="tab-content"><div class="tab">Tab 1 content</div><div class="tab"></div><div class="tab">Tab 3 content</div></div></div>

2
test/fixtures/templates/nested-tags-self-closing/expected.html vendored
View File

@ -1 +1 @@
<div class="tabs"><ul><li>Tab 1</li><li>Tab 3</li></ul><div class="tab-content"><div class="tab">Tab 1 content</div><div class="tab">Tab 3 content</div></div></div>
<div class="tabs"><ul><li>Tab 1</li><li>Tab 2</li><li>Tab 3</li></ul><div class="tab-content"><div class="tab">Tab 1 content</div><div class="tab"></div><div class="tab">Tab 3 content</div></div></div>