Merge branch 'gh-51'

sveltejs · Mar 4, 2017 · 5c1f7b6 · 5c1f7b6
2 parents 319b3b6 + 60c9c7c
commit 5c1f7b6
Show file tree

Hide file tree

Showing 3 changed files with 77 additions and 1 deletion.
diff --git a/src/parse/state/tag.js b/src/parse/state/tag.js
@@ -180,7 +180,7 @@ function readTagName ( parser ) {
 
 		while ( i-- ) {
 			const fragment = parser.stack[i];
-			if ( fragment.type === 'IfBlock' || fragment.type === 'ElseBlock' ) {
+			if ( fragment.type === 'IfBlock' || fragment.type === 'EachBlock' ) {
 				legal = true;
 				break;
 			}

diff --git a/test/generator/self-reference-tree/_config.js b/test/generator/self-reference-tree/_config.js
@@ -0,0 +1,65 @@
+export default {
+	data: {
+		file: {
+			name: '/',
+			type: 'folder',
+			children: [
+				{
+					name: 'foo.jpg',
+					type: 'image'
+				},
+				{
+					name: 'bar.jpg',
+					type: 'image'
+				},
+				{
+					name: 'baz',
+					type: 'folder',
+					children: [
+						{
+							name: '.DS_Store',
+							type: 'junk'
+						},
+						{
+							name: 'README.md',
+							type: 'markdown'
+						}
+					]
+				}
+			]
+		}
+	},
+
+	html: `
+		<article class='file folder'>
+			<span class='name'>/</span>
+
+			<ul>
+				<li>
+					<article class='file image'>
+						<span class='name'>foo.jpg</span>
+					</article>
+				</li><li>
+					<article class='file image'>
+						<span class='name'>bar.jpg</span>
+					</article>
+				</li><li>
+					<article class='file folder'>
+						<span class='name'>baz</span>
+						<ul>
+							<li>
+								<article class='file junk'>
+									<span class='name'>.DS_Store</span>
+								</article>
+							</li><li>
+								<article class='file markdown'>
+									<span class='name'>README.md</span>
+								</article>
+							</li>
+						</ul>
+					</article>
+				</li>
+			</ul>
+		</article>
+	`
+};
diff --git a/test/generator/self-reference-tree/main.html b/test/generator/self-reference-tree/main.html
@@ -0,0 +1,11 @@
+<article class='file {{file.type}}'>
+	<span class='name'>{{file.name}}</span>
+
+	{{#if file.type === 'folder'}}
+		<ul>
+			{{#each file.children as child}}
+				<li><:Self file='{{child}}'/></li>
+			{{/each}}
+		</ul>
+	{{/if}}
+</article>