From 366e0fbd8d9bf1b5865edb930e795a17e5547a43 Mon Sep 17 00:00:00 2001 From: Xavier Noria Date: Thu, 26 Aug 2010 01:56:56 +0200 Subject: Revert "to_json => as_json" This reverts commit 7a6d8e4ad47d571541762a6c80cc3e1f6831bd40. Reason: The method that gives you a Ruby string with JSON source code is #to_json --- railties/guides/source/action_view_overview.textile | 2 +- railties/guides/source/layouts_and_rendering.textile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/railties/guides/source/action_view_overview.textile b/railties/guides/source/action_view_overview.textile index cd3c0a1b7b..e242cdaf73 100644 --- a/railties/guides/source/action_view_overview.textile +++ b/railties/guides/source/action_view_overview.textile @@ -1380,7 +1380,7 @@ page.insert_html :bottom, 'my_list', '
  • Last item
    • ' h5. literal -Returns an object whose as_json evaluates to the code provided. Use this to pass a literal JavaScript expression as an argument to another JavaScriptGenerator method. +Returns an object whose to_json evaluates to the code provided. Use this to pass a literal JavaScript expression as an argument to another JavaScriptGenerator method. h5. redirect_to diff --git a/railties/guides/source/layouts_and_rendering.textile b/railties/guides/source/layouts_and_rendering.textile index 1bef4d2145..fe5b4c8773 100644 --- a/railties/guides/source/layouts_and_rendering.textile +++ b/railties/guides/source/layouts_and_rendering.textile @@ -285,7 +285,7 @@ JSON is a javascript data format used by many AJAX libraries. Rails has built-in render :json => @product -TIP: You don't need to call +as_json+ on the object that you want to render. If you use the +:json+ option, +render+ will automatically call +as_json+ for you. +TIP: You don't need to call +to_json+ on the object that you want to render. If you use the +:json+ option, +render+ will automatically call +to_json+ for you. h5. Rendering XML -- cgit v1.2.3