diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-09-29 02:05:07 -0300 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-09-29 02:05:07 -0300 |
commit | 0131c70175095379afd6cdc4a2ed05237791f87a (patch) | |
tree | 371d058a41f20ac2c1e5ff9691a045fb538508d7 /actionview/lib/action_view | |
parent | 1855312db964aa6b9ae7d2b3a3e5d9f54da1d163 (diff) | |
parent | 9331f00229205c3a018af92cb50907d4fc87ecdc (diff) | |
download | rails-0131c70175095379afd6cdc4a2ed05237791f87a.tar.gz rails-0131c70175095379afd6cdc4a2ed05237791f87a.tar.bz2 rails-0131c70175095379afd6cdc4a2ed05237791f87a.zip |
Merge pull request #21661 from akshay-vishnoi/submit_tag_tests
Fix - Prevent adding of `data-disable-with` option twice in html.
Diffstat (limited to 'actionview/lib/action_view')
-rw-r--r-- | actionview/lib/action_view/helpers/form_tag_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionview/lib/action_view/helpers/form_tag_helper.rb b/actionview/lib/action_view/helpers/form_tag_helper.rb index af684e05c6..0e8127e29e 100644 --- a/actionview/lib/action_view/helpers/form_tag_helper.rb +++ b/actionview/lib/action_view/helpers/form_tag_helper.rb @@ -450,9 +450,9 @@ module ActionView disable_with_text ||= value.clone tag_options.deep_merge!("data" => { "disable_with" => disable_with_text }) else - tag_options.delete("data-disable-with") tag_options["data"].delete(:disable_with) if tag_options["data"] end + tag_options.delete("data-disable-with") end tag :input, tag_options |