diff options
author | Sam Stephenson <sam@37signals.com> | 2006-01-23 17:09:15 +0000 |
---|---|---|
committer | Sam Stephenson <sam@37signals.com> | 2006-01-23 17:09:15 +0000 |
commit | 9c52a41241a632315edb77381240b66a7cc5aef4 (patch) | |
tree | 872352d82ff875e7d4ddd43c0f1adbc714e8282f /actionpack/lib/action_controller | |
parent | 185cca238bc1df79a3bb438679bbbeb980f82078 (diff) | |
download | rails-9c52a41241a632315edb77381240b66a7cc5aef4.tar.gz rails-9c52a41241a632315edb77381240b66a7cc5aef4.tar.bz2 rails-9c52a41241a632315edb77381240b66a7cc5aef4.zip |
Add the ability to call JavaScriptGenerator methods from helpers called in update blocks
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3476 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller')
-rwxr-xr-x | actionpack/lib/action_controller/base.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 0a9368f684..7f8ff5ed09 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -687,7 +687,7 @@ module ActionController #:nodoc: end def render_javascript(javascript, status = nil) - @response.headers['Content-type'] = 'text/javascript' + @response.headers['Content-Type'] = 'text/javascript' render_text(javascript, status) end @@ -719,7 +719,8 @@ module ActionController #:nodoc: @response.body = nil @performed_render = false end - + + # Clears the redirected results from the headers, resets the status to 200 and returns # the URL that was used to redirect or nil if there was no redirected URL # Note that +redirect_to+ will change the body of the response to indicate a redirection. |