diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2017-08-03 16:39:43 -0400 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2017-08-03 16:40:18 -0400 |
| commit | 7a5a84ba9c8648cd6fe5eeb9af2ada56118d8b57 (patch) | |
| tree | e310de6013b3e55bda4f6ad483981f04e29daaab | |
| parent | f1648f6539a2fd74c9c53a08f886813b5f1c14ba (diff) | |
| download | rails-7a5a84ba9c8648cd6fe5eeb9af2ada56118d8b57.tar.gz rails-7a5a84ba9c8648cd6fe5eeb9af2ada56118d8b57.tar.bz2 rails-7a5a84ba9c8648cd6fe5eeb9af2ada56118d8b57.zip | |
Remove duplicated convert_direct_upload_option_to_url
FormHelper includes FormTagHelper so we don't need to define two methods
| -rw-r--r-- | actionview/lib/action_view/helpers/form_helper.rb | 6 | ||||
| -rw-r--r-- | actionview/lib/action_view/helpers/form_tag_helper.rb | 5 |
2 files changed, 4 insertions, 7 deletions
diff --git a/actionview/lib/action_view/helpers/form_helper.rb b/actionview/lib/action_view/helpers/form_helper.rb index ac42de053c..8b6322f8ad 100644 --- a/actionview/lib/action_view/helpers/form_helper.rb +++ b/actionview/lib/action_view/helpers/form_helper.rb @@ -2316,12 +2316,6 @@ module ActionView options[:include_id] = !options.delete(:skip_id) end end - - def convert_direct_upload_option_to_url(options) - if options.delete(:direct_upload) - options['data-direct-upload-url'] = rails_direct_uploads_url - end - end end end diff --git a/actionview/lib/action_view/helpers/form_tag_helper.rb b/actionview/lib/action_view/helpers/form_tag_helper.rb index fd7184f8d3..2519ff2837 100644 --- a/actionview/lib/action_view/helpers/form_tag_helper.rb +++ b/actionview/lib/action_view/helpers/form_tag_helper.rb @@ -906,7 +906,10 @@ module ActionView end def convert_direct_upload_option_to_url(options) - options.merge('data-direct-upload-url': options.delete(:direct_upload) && respond_to?(:rails_direct_uploads_url) ? rails_direct_uploads_url : nil).compact + if options.delete(:direct_upload) && respond_to?(:rails_direct_uploads_url) + options["data-direct-upload-url"] = rails_direct_uploads_url + end + options end end end |