Permalink
Browse files

making non remote versions of link_to, button_to, submit_tag and imag…

…e_submit_tag output data attributes for things like :confirm, :method, :popup, and :disable_with
  • Loading branch information...
1 parent 9821648 commit 426a6b2e00665b04bab4fa5cee664fefd9957960 @erikstmartin erikstmartin committed with stefanpenner Jan 24, 2010
Showing with 3 additions and 0 deletions.
  1. +3 −0 actionpack/lib/action_view/helpers/javascript_helper.rb
@@ -215,7 +215,10 @@ def add_confirm_to_attributes!(html_options, confirm)
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

0 comments on commit 426a6b2

Please sign in to comment.