diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-03-12 12:22:52 -0700 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-03-12 12:34:47 -0700 |
commit | 82c6597dc244715c40151c7eb10f2016ed5ebb47 (patch) | |
tree | 7f6be03aa9895b1e1b7d026a92aab00ce891beb9 /actionpack/lib/action_view/base.rb | |
parent | 923067810480c93817dbae3d8295a18aa2a2ec3a (diff) | |
download | rails-82c6597dc244715c40151c7eb10f2016ed5ebb47.tar.gz rails-82c6597dc244715c40151c7eb10f2016ed5ebb47.tar.bz2 rails-82c6597dc244715c40151c7eb10f2016ed5ebb47.zip |
Eliminate internal render stack since we only need its head and tail
Diffstat (limited to 'actionpack/lib/action_view/base.rb')
-rw-r--r-- | actionpack/lib/action_view/base.rb | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb index fe6053e574..0f396817a5 100644 --- a/actionpack/lib/action_view/base.rb +++ b/actionpack/lib/action_view/base.rb @@ -221,10 +221,12 @@ module ActionView #:nodoc: def initialize(view_paths = [], assigns_for_first_render = {}, controller = nil)#:nodoc: @assigns = assigns_for_first_render @assigns_added = nil - @_render_stack = [] @controller = controller @helpers = ProxyModule.new(self) self.view_paths = view_paths + + @_first_template = nil + @_current_template = nil end attr_reader :view_paths @@ -286,7 +288,19 @@ module ActionView #:nodoc: # Access the current template being rendered. # Returns a ActionView::Template object. def template - @_render_stack.last + @_current_template + end + + def template=(template) #:nodoc: + @_first_template ||= template + @_current_template = template + end + + def with_template(current_template) + last_template, self.template = template, current_template + yield + ensure + self.template = last_template end private |