diff options
author | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-05-21 16:35:40 -0700 |
---|---|---|
committer | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-05-21 16:35:40 -0700 |
commit | 6923b392b740f2346326634532b40cf24a0f26ef (patch) | |
tree | 55a6486563e8d9a408c1dd8c7628e85c88af570e /actionpack/lib/action_view/helpers | |
parent | e773d0e68ac64bd26d86860a9a8e0048e2b6bb48 (diff) | |
download | rails-6923b392b740f2346326634532b40cf24a0f26ef.tar.gz rails-6923b392b740f2346326634532b40cf24a0f26ef.tar.bz2 rails-6923b392b740f2346326634532b40cf24a0f26ef.zip |
Added the :rjs render option
Diffstat (limited to 'actionpack/lib/action_view/helpers')
-rw-r--r-- | actionpack/lib/action_view/helpers/prototype_helper.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/lib/action_view/helpers/prototype_helper.rb b/actionpack/lib/action_view/helpers/prototype_helper.rb index 1fbe012a95..c0f5df3468 100644 --- a/actionpack/lib/action_view/helpers/prototype_helper.rb +++ b/actionpack/lib/action_view/helpers/prototype_helper.rb @@ -1,5 +1,6 @@ require 'set' require 'active_support/json' +require 'active_support/core_ext/object/extending' module ActionView module Helpers @@ -572,6 +573,7 @@ module ActionView # #include_helpers_from_context has nothing to overwrite. class JavaScriptGenerator #:nodoc: def initialize(context, &block) #:nodoc: + context._evaluate_assigns_and_ivars @context, @lines = context, [] include_helpers_from_context @context.with_output_buffer(@lines) do |