diff options
| author | Erik St. Martin <alakriti@gmail.com> | 2010-01-24 11:57:38 -0500 |
|---|---|---|
| committer | Stefan Penner <stefan.penner@gmail.com> | 2010-01-27 12:44:33 -0600 |
| commit | 426a6b2e00665b04bab4fa5cee664fefd9957960 (patch) | |
| tree | f51ae219124d1ffa1dd4403e66bd933ec5fe8cfb /actionpack | |
| parent | 9821648644e904efcad55961cc7082f574c11414 (diff) | |
| download | rails-426a6b2e00665b04bab4fa5cee664fefd9957960.tar.gz rails-426a6b2e00665b04bab4fa5cee664fefd9957960.tar.bz2 rails-426a6b2e00665b04bab4fa5cee664fefd9957960.zip | |
making non remote versions of link_to, button_to, submit_tag and image_submit_tag output data attributes for things like :confirm, :method, :popup, and :disable_with
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_view/helpers/javascript_helper.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/actionpack/lib/action_view/helpers/javascript_helper.rb b/actionpack/lib/action_view/helpers/javascript_helper.rb index ee6481b86d..58a92387b5 100644 --- a/actionpack/lib/action_view/helpers/javascript_helper.rb +++ b/actionpack/lib/action_view/helpers/javascript_helper.rb @@ -215,7 +215,10 @@ module ActionView end def add_method_to_attributes!(html_options, method, url = nil) +<<<<<<< HEAD html_options["rel"] = "nofollow" if method.to_s.downcase == "delete" +======= +>>>>>>> making non remote versions of link_to, button_to, submit_tag and image_submit_tag output data attributes for things like :confirm, :method, :popup, and :disable_with html_options["data-method"] = method if url.size > 0 html_options["data-url"] = url |