aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/helpers/url_helper.rb
diff options
context:
space:
mode:
authorkennyj <kennyj@gmail.com>2013-06-01 13:33:01 +0900
committerkennyj <kennyj@gmail.com>2013-06-01 23:17:16 +0900
commit8b80d723273fa8524daf2b806608ea7eb739c66c (patch)
treef810b1ec04722d5beb9067e253b1607f35ca2011 /actionpack/lib/action_view/helpers/url_helper.rb
parent6c2cbc6fff719fcd2a191c621ab41ed7ac917e67 (diff)
downloadrails-8b80d723273fa8524daf2b806608ea7eb739c66c.tar.gz
rails-8b80d723273fa8524daf2b806608ea7eb739c66c.tar.bz2
rails-8b80d723273fa8524daf2b806608ea7eb739c66c.zip
Remove :confirm and :disable_with options for ActionView::Helpers::UrlHelper#link_to and #button_to were deprecated.
Diffstat (limited to 'actionpack/lib/action_view/helpers/url_helper.rb')
-rw-r--r--actionpack/lib/action_view/helpers/url_helper.rb18
1 files changed, 0 insertions, 18 deletions
diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb
index 22059a0170..8a83f6f356 100644
--- a/actionpack/lib/action_view/helpers/url_helper.rb
+++ b/actionpack/lib/action_view/helpers/url_helper.rb
@@ -548,28 +548,10 @@ module ActionView
html_options = html_options.stringify_keys
html_options['data-remote'] = 'true' if link_to_remote_options?(options) || link_to_remote_options?(html_options)
- disable_with = html_options.delete("disable_with")
- confirm = html_options.delete('confirm')
method = html_options.delete('method')
- if confirm
- message = ":confirm option is deprecated and will be removed from Rails 4.1. " \
- "Use 'data: { confirm: \'Text\' }' instead."
- ActiveSupport::Deprecation.warn message
-
- html_options["data-confirm"] = confirm
- end
-
add_method_to_attributes!(html_options, method) if method
- if disable_with
- message = ":disable_with option is deprecated and will be removed from Rails 4.1. " \
- "Use 'data: { disable_with: \'Text\' }' instead."
- ActiveSupport::Deprecation.warn message
-
- html_options["data-disable-with"] = disable_with
- end
-
html_options
else
link_to_remote_options?(options) ? {'data-remote' => 'true'} : {}