diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index c02f4e345b..b9bfb8ccd6 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,6 +1,6 @@ *SVN* -* Deprecation: remove deprecated request, redirect, and dependency methods. Remove deprecated instance variables. Remove uses_component_template_root for toplevel components directory. Privatize deprecated render_partial and render_partial_collection view methods. Remove deprecated link_to_image and link_image_to helper methods. Remove deprecated human_size helper alias. [Jeremy Kemper] +* Deprecation: remove deprecated request, redirect, and dependency methods. Remove deprecated instance variables. Remove uses_component_template_root for toplevel components directory. Privatize deprecated render_partial and render_partial_collection view methods. Remove deprecated link_to_image, link_image_to, update_element_function, start_form_tag, and end_form_tag helper methods. Remove deprecated human_size helper alias. [Jeremy Kemper] * Consistent public/protected/private visibility for chained methods. #7813 [Dan Manges] diff --git a/actionpack/lib/action_view/helpers/deprecated_helper.rb b/actionpack/lib/action_view/helpers/deprecated_helper.rb deleted file mode 100644 index 04392f5b04..0000000000 --- a/actionpack/lib/action_view/helpers/deprecated_helper.rb +++ /dev/null @@ -1,34 +0,0 @@ -module ActionView - module Helpers - module PrototypeHelper - - def update_element_function(element_id, options = {}, &block) - content = escape_javascript(options[:content] || '') - content = escape_javascript(capture(&block)) if block - - javascript_function = case (options[:action] || :update) - when :update - if options[:position] - "new Insertion.#{options[:position].to_s.camelize}('#{element_id}','#{content}')" - else - "$('#{element_id}').innerHTML = '#{content}'" - end - - when :empty - "$('#{element_id}').innerHTML = ''" - - when :remove - "Element.remove('#{element_id}')" - - else - raise ArgumentError, "Invalid action, choose one of :update, :remove, :empty" - end - - javascript_function << ";\n" - options[:binding] ? concat(javascript_function, options[:binding]) : javascript_function - end - deprecate :update_element_function => "use RJS instead" - - end - end -end \ No newline at end of file diff --git a/actionpack/lib/action_view/helpers/form_tag_helper.rb b/actionpack/lib/action_view/helpers/form_tag_helper.rb index fa610215a4..417b0fd4b7 100644 --- a/actionpack/lib/action_view/helpers/form_tag_helper.rb +++ b/actionpack/lib/action_view/helpers/form_tag_helper.rb @@ -39,14 +39,6 @@ def form_tag(url_for_options = {}, options = {}, *parameters_for_url, &block) end end - alias_method :start_form_tag, :form_tag - - # Outputs "" - def end_form_tag - "" - end - - deprecate :end_form_tag, :start_form_tag => :form_tag # Creates a dropdown selection box, or if the :multiple option is set to true, a multiple # choice selection box. diff --git a/actionpack/test/controller/capture_test.rb b/actionpack/test/controller/capture_test.rb index 300bdc3a84..42ec2568da 100644 --- a/actionpack/test/controller/capture_test.rb +++ b/actionpack/test/controller/capture_test.rb @@ -64,19 +64,8 @@ def test_non_erb_block_content_for assert_equal expected_content_for_output, @response.body end - def test_update_element_with_capture - assert_deprecated 'update_element_function' do - get :update_element_with_capture - end - assert_equal( - "" + - "\n\n$('status').innerHTML = '\\n You bought something!\\n';", - @response.body.strip - ) - end - private - def expected_content_for_output - "