aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/base
diff options
context:
space:
mode:
authorYehuda Katz <wycats@gmail.com>2009-08-06 19:45:40 -0300
committerYehuda Katz <wycats@gmail.com>2009-08-06 19:45:40 -0300
commitaf375a5eb3aba149590be1636480e1c3976c124f (patch)
tree250d682085fe30291a47ee38cf19e6ddca7b68f3 /actionpack/lib/action_controller/base
parentf0945409d935cdd3cb783a728d68414e7ca02dfc (diff)
downloadrails-af375a5eb3aba149590be1636480e1c3976c124f.tar.gz
rails-af375a5eb3aba149590be1636480e1c3976c124f.tar.bz2
rails-af375a5eb3aba149590be1636480e1c3976c124f.zip
Replace _action_view with view_context to reflect that it is public and that it does not need to be an ActionView instance
Diffstat (limited to 'actionpack/lib/action_controller/base')
-rw-r--r--actionpack/lib/action_controller/base/compatibility.rb4
-rw-r--r--actionpack/lib/action_controller/base/render_options.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/base/compatibility.rb b/actionpack/lib/action_controller/base/compatibility.rb
index 13813ffd17..23e7b1b3af 100644
--- a/actionpack/lib/action_controller/base/compatibility.rb
+++ b/actionpack/lib/action_controller/base/compatibility.rb
@@ -72,7 +72,7 @@ module ActionController
# TODO: Remove this after we flip
def template
- @template ||= _action_view
+ @template ||= view_context
end
def process_action(*)
@@ -141,7 +141,7 @@ module ActionController
end
def view_paths
- _action_view.view_paths
+ view_context.view_paths
end
end
end
diff --git a/actionpack/lib/action_controller/base/render_options.rb b/actionpack/lib/action_controller/base/render_options.rb
index fc9a02626f..65ee09883e 100644
--- a/actionpack/lib/action_controller/base/render_options.rb
+++ b/actionpack/lib/action_controller/base/render_options.rb
@@ -85,7 +85,7 @@ module ActionController
register_renderer :update
def _render_update(proc, options)
- generator = ActionView::Helpers::PrototypeHelper::JavaScriptGenerator.new(_action_view, &proc)
+ generator = ActionView::Helpers::PrototypeHelper::JavaScriptGenerator.new(view_context, &proc)
self.content_type = Mime::JS
self.response_body = generator.to_s
end