aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/metal/renderers.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-03-12 20:39:53 +0100
committerJosé Valim <jose.valim@gmail.com>2010-03-12 20:39:53 +0100
commitf2c0a353aef41a6df2de8e1fe3eaa3d8bbd8a6dd (patch)
treea854e0b7b79968f7f7cdfb57d29fd6644805c5ae /actionpack/lib/action_controller/metal/renderers.rb
parent2a12686832fbcf0566454904a5d733998506bf56 (diff)
downloadrails-f2c0a353aef41a6df2de8e1fe3eaa3d8bbd8a6dd.tar.gz
rails-f2c0a353aef41a6df2de8e1fe3eaa3d8bbd8a6dd.tar.bz2
rails-f2c0a353aef41a6df2de8e1fe3eaa3d8bbd8a6dd.zip
Finish cleaning up rendering stack from views and move assigns evaluation to controller (so plugins and/or controllers can overwrite just one method).
Diffstat (limited to 'actionpack/lib/action_controller/metal/renderers.rb')
-rw-r--r--actionpack/lib/action_controller/metal/renderers.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/renderers.rb b/actionpack/lib/action_controller/metal/renderers.rb
index 49d3d6b466..08325b468c 100644
--- a/actionpack/lib/action_controller/metal/renderers.rb
+++ b/actionpack/lib/action_controller/metal/renderers.rb
@@ -87,8 +87,9 @@ module ActionController
end
add :update do |proc, options|
+ _evaluate_assigns(view_context)
generator = ActionView::Helpers::PrototypeHelper::JavaScriptGenerator.new(view_context, &proc)
- self.content_type = Mime::JS
+ self.content_type = Mime::JS
self.response_body = generator.to_s
end
end