diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-06-08 14:08:04 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-06-08 14:08:04 -0700 |
| commit | a6bf6f275c4fb25e5521faa148d2d2ea63a064b2 (patch) | |
| tree | 1969098bfe92e6cedf1b01e3676d3f12633fd4da /actionpack | |
| parent | 86fc43fd584726ba81b1a3b3e0a6f6000c1f4cc8 (diff) | |
| download | rails-a6bf6f275c4fb25e5521faa148d2d2ea63a064b2.tar.gz rails-a6bf6f275c4fb25e5521faa148d2d2ea63a064b2.tar.bz2 rails-a6bf6f275c4fb25e5521faa148d2d2ea63a064b2.zip | |
Use as_json instead of rails_to_json
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_view/helpers/prototype_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/prototype_helper.rb b/actionpack/lib/action_view/helpers/prototype_helper.rb index 22fcf9d29f..4c2fcb3bd0 100644 --- a/actionpack/lib/action_view/helpers/prototype_helper.rb +++ b/actionpack/lib/action_view/helpers/prototype_helper.rb @@ -1176,7 +1176,7 @@ module ActionView class JavaScriptVariableProxy < JavaScriptProxy #:nodoc: def initialize(generator, variable) - @variable = variable + @variable = ActiveSupport::JSON::Variable.new(variable) @empty = true # only record lines if we have to. gets rid of unnecessary linebreaks super(generator) end @@ -1187,7 +1187,7 @@ module ActionView true end - def rails_to_json(*) + def as_json(options = nil) @variable end |