Merge pull request #28 from joonas-lahtinen/master

Update dist & support objects which do not have Object as prototype
shannonmoeller · Nov 14, 2015 · b9e6675 · b9e6675
2 parents bfff859 + 53462ef
commit b9e6675
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 12 deletions.
diff --git a/dist/handlebars-layouts.js b/dist/handlebars-layouts.js
@@ -34,15 +34,21 @@ function getActionsByName(context, name) {
 }
 
 function applyAction(val, action) {
+	var context = this;
+
+	function fn() {
+		return action.fn(context, action.options);
+	}
+
 	switch (action.mode) {
 		case 'append': {
-			return val + action.fn(this);
+			return val + fn();
 		}
 		case 'prepend': {
-			return action.fn(this) + val;
+			return fn() + val;
 		}
 		case 'replace': {
-			return action.fn(this);
+			return fn();
 		}
 		default: {
 			return val;
@@ -64,7 +70,7 @@ function mixin(target) {
 
 		for (key in arg) {
 			// istanbul ignore else
-			if (arg.hasOwnProperty(key)) {
+			if (Object.prototype.hasOwnProperty.call(arg, key)) {
 				target[key] = arg[key];
 			}
 		}
@@ -101,12 +107,10 @@ function layouts(handlebars) {
 			options = options || {};
 
 			var fn = options.fn || noop,
-				context = handlebars.createFrame(this || {}),
+				context = mixin({}, this, customContext, options.hash),
+				data = handlebars.createFrame(options.data),
 				template = handlebars.partials[name];
 
-			// Mix custom context and hash into context
-			mixin(context, customContext, options.hash);
-
 			// Partial template required
 			if (template == null) {
 				throw new Error('Missing partial: \'' + name + '\'');
@@ -121,7 +125,7 @@ function layouts(handlebars) {
 			getStack(context).push(fn);
 
 			// Render partial
-			return template(context);
+			return template(context, { data: data });
 		},
 
 		/**
@@ -134,7 +138,7 @@ function layouts(handlebars) {
 		 * @return {String} Rendered partial.
 		 */
 		embed: function () {
-			var context = handlebars.createFrame(this || {});
+			var context = mixin({}, this || {});
 
 			// Reset context
 			context.$$layoutStack = null;
@@ -155,13 +159,14 @@ function layouts(handlebars) {
 			options = options || {};
 
 			var fn = options.fn || noop,
+				data = handlebars.createFrame(options.data),
 				context = this || {};
 
 			applyStack(context);
 
 			return getActionsByName(context, name).reduce(
 				applyAction.bind(context),
-				fn(context)
+				fn(context, { data: data })
 			);
 		},
 
@@ -178,6 +183,7 @@ function layouts(handlebars) {
 			options = options || {};
 
 			var fn = options.fn,
+				data = handlebars.createFrame(options.data),
 				hash = options.hash || {},
 				mode = hash.mode || 'replace',
 				context = this || {};
@@ -191,6 +197,7 @@ function layouts(handlebars) {
 
 			// Setter
 			getActionsByName(context, name).push({
+				options: { data: data },
 				mode: mode.toLowerCase(),
 				fn: fn
 			});

diff --git a/index.js b/index.js
@@ -69,7 +69,7 @@ function mixin(target) {
 
 		for (key in arg) {
 			// istanbul ignore else
-			if (arg.hasOwnProperty(key)) {
+			if (Object.prototype.hasOwnProperty.call(arg, key)) {
 				target[key] = arg[key];
 			}
 		}

diff --git a/test/expected/templates/non-object.html b/test/expected/templates/non-object.html
@@ -0,0 +1,19 @@
+<!doctype html>
+<html lang="en-us">
+<head>
+		<title></title>
+
+		<link rel="stylesheet" href="assets/css/screen.css" />
+</head>
+<body>
+	<div class="site">
+
+		<div class="site-bd" role="main">
+		<p>value</p>
+		</div>
+
+	</div>
+
+		<script src="assets/js/controllers/home.js"></script>
+</body>
+</html>
diff --git a/test/fixtures/templates/non-object.html b/test/fixtures/templates/non-object.html
@@ -0,0 +1,5 @@
+{{#extend "layout"}}
+	{{#content "body"}}
+		<p>{{ key }}</p>
+	{{/content}}
+{{/extend}}
diff --git a/test/handlebars-layouts.e2e.js b/test/handlebars-layouts.e2e.js
@@ -119,6 +119,13 @@ describe('handlebars-layouts e2e', function () {
 		testWithFile('hash.html', data, done);
 	});
 
+	it('should pass through non-object values', function (done) {
+		var data = Object.create(null);
+
+		data.key = 'value';
+		testWithFile('non-object.html', data, done);
+	});
+
 	it('should throw an error if partial is not registered', function (done) {
 		testWithFile('error.html', {}, done);
 	});