aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorSam Stephenson <sam@37signals.com>2006-01-23 06:52:26 +0000
committerSam Stephenson <sam@37signals.com>2006-01-23 06:52:26 +0000
commit84361478256f620cc3c4d31235eeec28bba058f0 (patch)
tree2b264f894cb9f052e72e3dec17e509ac72c0c617 /actionpack/lib/action_controller
parentd921b799747aacb47dc8bbca9b2eefe25159e9d5 (diff)
downloadrails-84361478256f620cc3c4d31235eeec28bba058f0.tar.gz
rails-84361478256f620cc3c4d31235eeec28bba058f0.tar.bz2
rails-84361478256f620cc3c4d31235eeec28bba058f0.zip
Add the ability to call JavaScriptGenerator methods from helpers called in update blocks
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3470 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller')
-rwxr-xr-xactionpack/lib/action_controller/base.rb5
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.