From 426a6b2e00665b04bab4fa5cee664fefd9957960 Mon Sep 17 00:00:00 2001 From: "Erik St. Martin" Date: Sun, 24 Jan 2010 11:57:38 -0500 Subject: 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 --- actionpack/lib/action_view/helpers/javascript_helper.rb | 3 +++ 1 file changed, 3 insertions(+) (limited to 'actionpack') 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 -- cgit v1.2.3