aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorCarlos Galdino + Rafael Mendonça França <rafael.franca+carlos.galdino@plataformatec.com.br>2012-05-14 16:55:13 -0300
committerCarlos Galdino + Rafael Mendonça França <rafael.franca+carlos.galdino@plataformatec.com.br>2012-05-14 16:55:13 -0300
commite9051e20aeb2c666db06b6217954737665878db7 (patch)
tree8f47ad006a0de1969030659337a4e92cca4a1216 /actionpack/lib
parentd47d6e7eda3aa3e6aa28d0c17ac6801234bb97d1 (diff)
downloadrails-e9051e20aeb2c666db06b6217954737665878db7.tar.gz
rails-e9051e20aeb2c666db06b6217954737665878db7.tar.bz2
rails-e9051e20aeb2c666db06b6217954737665878db7.zip
Deprecate `:disable_with` for `button_tag` too
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_view/helpers/form_tag_helper.rb4
-rw-r--r--actionpack/lib/action_view/helpers/url_helper.rb2
2 files changed, 4 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/form_tag_helper.rb b/actionpack/lib/action_view/helpers/form_tag_helper.rb
index 8ccffb4952..3d3ae44eb4 100644
--- a/actionpack/lib/action_view/helpers/form_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/form_tag_helper.rb
@@ -417,7 +417,7 @@ module ActionView
options = options.stringify_keys
if disable_with = options.delete("disable_with")
- ActiveSupport::Deprecation.warn ":disable_with option is deprecated and will be removed from Rails 4.0. Use :data-disable-with instead"
+ ActiveSupport::Deprecation.warn ":disable_with option is deprecated and will be removed from Rails 4.0. Use 'data-disable-with' instead"
options["data-disable-with"] = disable_with
end
@@ -469,6 +469,8 @@ module ActionView
options = options.stringify_keys
if disable_with = options.delete("disable_with")
+ ActiveSupport::Deprecation.warn ":disable_with option is deprecated and will be removed from Rails 4.0. Use 'data-disable-with' instead"
+
options["data-disable-with"] = disable_with
end
diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb
index 804b204fd1..6f05881d08 100644
--- a/actionpack/lib/action_view/helpers/url_helper.rb
+++ b/actionpack/lib/action_view/helpers/url_helper.rb
@@ -623,7 +623,7 @@ module ActionView
method = html_options.delete('method')
if disable_with
- ActiveSupport::Deprecation.warn ":disable_with option is deprecated and will be removed from Rails 4.0. Use :data-disable-with instead"
+ ActiveSupport::Deprecation.warn ":disable_with option is deprecated and will be removed from Rails 4.0. Use 'data-disable-with' instead"
html_options["data-disable-with"] = disable_with
end