aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2011-03-25 23:12:09 +0100
committerXavier Noria <fxn@hashref.com>2011-04-13 13:23:18 +0200
commit5850f1693546f14420bf0bc630a48650f0d606d5 (patch)
tree0e7e1b631c5d4e0b85af3b448f39dbf4cb483cb8 /actionpack/lib/action_controller
parenteea66892c80d51c1b959171c2e3feac67124aaba (diff)
downloadrails-5850f1693546f14420bf0bc630a48650f0d606d5.tar.gz
rails-5850f1693546f14420bf0bc630a48650f0d606d5.tar.bz2
rails-5850f1693546f14420bf0bc630a48650f0d606d5.zip
removes the RJS template handler
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/metal/mime_responds.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/metal/mime_responds.rb b/actionpack/lib/action_controller/metal/mime_responds.rb
index 618a6cdb7d..16d48e4677 100644
--- a/actionpack/lib/action_controller/metal/mime_responds.rb
+++ b/actionpack/lib/action_controller/metal/mime_responds.rb
@@ -33,10 +33,10 @@ module ActionController #:nodoc:
# and all actions except <tt>:edit</tt> respond to <tt>:xml</tt> and
# <tt>:json</tt>.
#
- # respond_to :rjs, :only => :create
+ # respond_to :json, :only => :create
#
# This specifies that the <tt>:create</tt> action and no other responds
- # to <tt>:rjs</tt>.
+ # to <tt>:json</tt>.
def respond_to(*mimes)
options = mimes.extract_options!
@@ -106,8 +106,8 @@ module ActionController #:nodoc:
# end
# end
#
- # If the client wants HTML, we just redirect them back to the person list. If they want Javascript
- # (format.js), then it is an RJS request and we render the RJS template associated with this action.
+ # If the client wants HTML, we just redirect them back to the person list. If they want JavaScript,
+ # then it is an Ajax request and we render the JavaScript template associated with this action.
# Lastly, if the client wants XML, we render the created person as XML, but with a twist: we also
# include the person's company in the rendered XML, so you get something like this:
#