summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2012-01-04 10:23:49 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2012-01-04 10:23:49 +0100
commit9f31428234e0dad595502ab8d6fe35aedc54c8ce (patch)
tree33956a22e4fb86b2e648e6741db14f901fadc0be /lib
parenta92745b8dbd4aefb33831776747ce124f327c6d0 (diff)
downloadzorglub-9f31428234e0dad595502ab8d6fe35aedc54c8ce.zip
zorglub-9f31428234e0dad595502ab8d6fe35aedc54c8ce.tar.gz
Node#feed! set state :partial if @action[:layout].nil?
Diffstat (limited to 'lib')
-rw-r--r--lib/zorglub/node.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/zorglub/node.rb b/lib/zorglub/node.rb
index 63366e8..e499a0c 100644
--- a/lib/zorglub/node.rb
+++ b/lib/zorglub/node.rb
@@ -118,9 +118,9 @@ module Zorglub
Node.call_before_hooks self
state :meth
@content = self.send @action[:method], *@action[:args]
- e, v, l = Config.engine_proc(@action[:engine]), view, layout
+ v, l, e = view, layout, Config.engine_proc(@action[:engine])
# TODO compile and cache
- state :view
+ state (@action[:layout].nil? ? :partial : :view)
@content = e.call v, self if e and File.exists? v
state :layout
@content = e.call l, self if e and File.exists? l