Corrected content rendering order.

shannonmoeller · Apr 25, 2015 · 8632843 · 8632843
1 parent 7ddfe02
commit 8632843
Show file tree

Hide file tree

Showing 7 changed files with 72 additions and 4 deletions.
diff --git a/dist/handlebars-layouts.js b/dist/handlebars-layouts.js
@@ -15,7 +15,7 @@ function applyStack(context) {
 	var stack = getStack(context);
 
 	while (stack.length) {
-		stack.pop()(context);
+		stack.shift()(context);
 	}
 }
 

diff --git a/index.js b/index.js
@@ -14,7 +14,7 @@ function applyStack(context) {
 	var stack = getStack(context);
 
 	while (stack.length) {
-		stack.pop()(context);
+		stack.shift()(context);
 	}
 }
 

diff --git a/test/expected/templates/deep-extend.html b/test/expected/templates/deep-extend.html
@@ -0,0 +1,26 @@
+<!doctype>
+<html>
+<body>
+		<p>d1.1</p>
+		<p>d1</p>
+		<p>c1.1</p>
+		<p>c1</p>
+		<p>b1.1</p>
+		<p>b1</p>
+		<p>a1</p>
+
+		<p>d2</p>
+
+		<p>a3</p>
+		<p>b3</p>
+
+				<p>c4</p>
+		<p>d4</p>
+
+		<p>c3</p>
+
+				<p>d5</p>
+
+		<p>d3</p>
+</body>
+</html>
diff --git a/test/fixtures/partials/deep-b.hbs b/test/fixtures/partials/deep-b.hbs
@@ -3,6 +3,10 @@
 		<p>b1</p>
 	{{/content}}
 
+	{{#content "top" mode="prepend"}}
+		<p>b1.1</p>
+	{{/content}}
+
 	{{#content "middle"}}
 		<p>b2</p>
 	{{/content}}

diff --git a/test/fixtures/partials/deep-c.hbs b/test/fixtures/partials/deep-c.hbs
@@ -3,6 +3,10 @@
 		<p>c1</p>
 	{{/content}}
 
+	{{#content "top" mode="prepend"}}
+		<p>c1.1</p>
+	{{/content}}
+
 	{{#content "middle"}}
 		<p>c2</p>
 	{{/content}}
@@ -13,7 +17,7 @@
 		{{{block "c"}}}
 	{{/content}}
 
-	{{#content "b" mode="prepend"}}
+	{{#content "b" mode="append"}}
 		<p>c4</p>
 	{{/content}}
 {{/extend}}
diff --git a/test/fixtures/templates/deep-extend.html b/test/fixtures/templates/deep-extend.html
@@ -0,0 +1,25 @@
+{{#extend "deep-c"}}
+	{{#content "top" mode="prepend"}}
+		<p>d1</p>
+	{{/content}}
+
+	{{#content "top" mode="prepend"}}
+		<p>d1.1</p>
+	{{/content}}
+
+	{{#content "middle"}}
+		<p>d2</p>
+	{{/content}}
+
+	{{#content "bottom" mode="append"}}
+		<p>d3</p>
+	{{/content}}
+
+	{{#content "b" mode="append"}}
+		<p>d4</p>
+	{{/content}}
+
+	{{#content "c" mode="append"}}
+		<p>d5</p>
+	{{/content}}
+{{/extend}}
diff --git a/test/handlebars-layouts.e2e.js b/test/handlebars-layouts.e2e.js
@@ -10,7 +10,8 @@ var handlebars,
 	config = {
 		partials: __dirname + '/fixtures/partials/',
 		fixtures: __dirname + '/fixtures/templates/',
-		expected: __dirname + '/expected/templates/'
+		expected: __dirname + '/expected/templates/',
+		actual: __dirname + '/actual/templates/'
 	};
 
 describe('handlebars-layouts e2e', function () {
@@ -46,6 +47,7 @@ describe('handlebars-layouts e2e', function () {
 		vinylFs
 			.src(fixture)
 			.pipe(through.obj(compileFile))
+			// .pipe(vinylFs.dest(config.actual))
 			.on('data', expectFile)
 			.on('error', expectError);
 	}
@@ -64,6 +66,9 @@ describe('handlebars-layouts e2e', function () {
 
 		// Register partials
 		handlebars.registerPartial({
+			'deep-a':   read(config.partials + '/deep-a.hbs'),
+			'deep-b':   read(config.partials + '/deep-b.hbs'),
+			'deep-c':   read(config.partials + '/deep-c.hbs'),
 			layout:     read(config.partials + '/layout.hbs'),
 			layout2col: read(config.partials + '/layout2col.hbs'),
 			media:      read(config.partials + '/media.hbs'),
@@ -77,6 +82,10 @@ describe('handlebars-layouts e2e', function () {
 		testWithFile('extend.html', data, done);
 	});
 
+	it('should deeply extend layouts', function (done) {
+		testWithFile('deep-extend.html', {}, done);
+	});
+
 	it('should embed layouts', function (done) {
 		var data = require('./fixtures/data/users.json');