Added layout(path) helper to change the layout within a view. Closes #…

…610
expressjs · Apr 2, 2011 · 371d66b · 371d66b
1 parent 25bddf3
commit 371d66b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/examples/layout-control/views/pages/alternate.ejs b/examples/layout-control/views/pages/alternate.ejs
@@ -1,2 +1,2 @@
-<% locals.layout = 'layouts/alternate' %>
+<% layout('layouts/alternate') %>
 <h1>Page</h1>
diff --git a/lib/view.js b/lib/view.js
@@ -346,6 +346,11 @@ res._render = function(view, opts, fn, parent, sub){
     if (cacheViews) cache[orig.view] = view;
   }
 
+  // layout helper
+  options.layout = function(path){
+    layout = path;
+  };
+
   // render
   var str = view.fn.call(options.scope, options);
 

diff --git a/test/fixtures/layout-switch.jade b/test/fixtures/layout-switch.jade
@@ -1,2 +1,2 @@
-- locals.layout = 'layouts/alternate'
+- layout('layouts/alternate')
 h1 My Page
diff --git a/test/fixtures/layouts/alternate.jade b/test/fixtures/layouts/alternate.jade
@@ -1 +1 @@
-#alternate= body
+#alternate!= body