Skip to content
Browse files

fixing last merge breakage

  • Loading branch information...
1 parent 133f601 commit 9e3e1b3f24e2ba47f675ecbfc44c269323637985 @erikstmartin erikstmartin committed with stefanpenner Jan 24, 2010
View
10 actionpack/lib/action_view/helpers/ajax_helper.rb
@@ -493,16 +493,6 @@ def script_decorator(options)
private
- def extract_confirm_attributes!(options)
- attributes = {}
-
- if options && options[:confirm]
- attributes["data-confirm"] = options.delete(:confirm)
- end
-
- attributes
- end
-
def extract_remote_attributes!(options)
attributes = options.delete(:html) || {}
View
3 actionpack/lib/action_view/helpers/javascript_helper.rb
@@ -215,10 +215,7 @@ 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 9e3e1b3

Please sign in to comment.
Something went wrong with that request. Please try again.