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/base.rb | |
| 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/base.rb')
| -rw-r--r-- | actionpack/lib/action_view/base.rb | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb index 6b72d406af..4ab568b44c 100644 --- a/actionpack/lib/action_view/base.rb +++ b/actionpack/lib/action_view/base.rb @@ -269,15 +269,16 @@ module ActionView #:nodoc: nil end - private - # Evaluates the local assigns and controller ivars, pushes them to the view. - def _evaluate_assigns_and_ivars #:nodoc: - unless @assigns_added - @assigns.each { |key, value| instance_variable_set("@#{key}", value) } - _copy_ivars_from_controller - @assigns_added = true - end + # Evaluates the local assigns and controller ivars, pushes them to the view. + def _evaluate_assigns_and_ivars #:nodoc: + unless @assigns_added + @assigns.each { |key, value| instance_variable_set("@#{key}", value) } + _copy_ivars_from_controller + @assigns_added = true end + end + + private def _copy_ivars_from_controller #:nodoc: if @controller |