Fixed zappajs#80: Default layout is not being added correctly.

rmetzler · Sep 16, 2011 · d4ad782 · d4ad782
1 parent 4b44163
commit d4ad782
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
   - Changed: using standard jquery from code.jquery.com instead of node-jquery. Updated to 1.6.4.
   - Changed: updated sammy to 0.7.0.
+  - Fixed #80: Default layout is not being added correctly.
 
 **v0.2.0** (2011-09-08):
 

diff --git a/docs/zappa.html b/docs/zappa.html
@@ -256,7 +256,7 @@
       <span class="nx">res</span><span class="p">.</span><span class="nx">send</span> <span class="nx">sammy</span>
 
   <span class="k">if</span> <span class="nx">app</span><span class="p">.</span><span class="nx">settings</span><span class="p">[</span><span class="s1">&#39;default layout&#39;</span><span class="p">]</span>
-    <span class="nv">views.layout = </span><span class="o">-&gt;</span>
+    <span class="nx">root_locals</span><span class="p">.</span><span class="nx">view</span> <span class="nv">layout: </span><span class="o">-&gt;</span>
       <span class="nx">doctype</span> <span class="mi">5</span>
       <span class="nx">html</span> <span class="o">-&gt;</span>
         <span class="nx">head</span> <span class="o">-&gt;</span>

diff --git a/src/zappa.coffee b/src/zappa.coffee
@@ -340,7 +340,7 @@ zappa.app = ->
       res.send sammy
 
   if app.settings['default layout']
-    views.layout = ->
+    root_locals.view layout: ->
       doctype 5
       html ->
         head ->