diff options
| author | Erik St. Martin <alakriti@gmail.com> | 2010-01-23 14:10:24 -0500 |
|---|---|---|
| committer | Stefan Penner <stefan.penner@gmail.com> | 2010-01-27 12:44:32 -0600 |
| commit | 565a696e71606a6e4dfe5b1c7f9fadbce50e04b1 (patch) | |
| tree | e68c4b3b5e4928394ca8280f87af7e817e502b7f /actionpack/lib/action_view/helpers/ajax_helper.rb | |
| parent | 5462caf434d7313b0a5bff75fd2bca35bbaf42a6 (diff) | |
| download | rails-565a696e71606a6e4dfe5b1c7f9fadbce50e04b1.tar.gz rails-565a696e71606a6e4dfe5b1c7f9fadbce50e04b1.tar.bz2 rails-565a696e71606a6e4dfe5b1c7f9fadbce50e04b1.zip | |
Removed all helpers from PrototypeHelper that are implemented in AjaxHelper. Modified tests that extended with PrototypeHelper to now extend using AjaxHelper. AjaxHelper is now included by default in view helper
Diffstat (limited to 'actionpack/lib/action_view/helpers/ajax_helper.rb')
| -rw-r--r-- | actionpack/lib/action_view/helpers/ajax_helper.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/ajax_helper.rb b/actionpack/lib/action_view/helpers/ajax_helper.rb index 9c1d6a722d..550f7fbbe2 100644 --- a/actionpack/lib/action_view/helpers/ajax_helper.rb +++ b/actionpack/lib/action_view/helpers/ajax_helper.rb @@ -1,7 +1,9 @@ module ActionView module Helpers module AjaxHelper - include PrototypeHelper + # Included for backwards compatibility / RJS functionality + # Rails classes should not be aware of individual JS frameworks + include PrototypeHelper def remote_form_for(record_or_name_or_array, *args, &proc) options = args.extract_options! @@ -19,6 +21,7 @@ module ActionView attributes.merge!(options) url = attributes.delete("data-url") + attributes.delete(:builder) form_tag(attributes.delete(:action) || url, attributes, &block) end |