Skip to content
This repository
Browse code

fixing last merge breakage

  • Loading branch information...
commit 9e3e1b3f24e2ba47f675ecbfc44c269323637985 1 parent 133f601
Erik St. Martin erikstmartin authored stefanpenner committed
10 actionpack/lib/action_view/helpers/ajax_helper.rb
@@ -493,16 +493,6 @@ def script_decorator(options)
493 493
494 494 private
495 495
496   - def extract_confirm_attributes!(options)
497   - attributes = {}
498   -
499   - if options && options[:confirm]
500   - attributes["data-confirm"] = options.delete(:confirm)
501   - end
502   -
503   - attributes
504   - end
505   -
506 496 def extract_remote_attributes!(options)
507 497 attributes = options.delete(:html) || {}
508 498
3  actionpack/lib/action_view/helpers/javascript_helper.rb
@@ -215,10 +215,7 @@ def add_confirm_to_attributes!(html_options, confirm)
215 215 end
216 216
217 217 def add_method_to_attributes!(html_options, method, url = nil)
218   -<<<<<<< HEAD
219 218 html_options["rel"] = "nofollow" if method.to_s.downcase == "delete"
220   -=======
221   ->>>>>>> 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
222 219 html_options["data-method"] = method
223 220 if url.size > 0
224 221 html_options["data-url"] = url

0 comments on commit 9e3e1b3

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