diff options
| author | Erik St. Martin <alakriti@gmail.com> | 2010-01-24 13:13:40 -0500 |
|---|---|---|
| committer | Stefan Penner <stefan.penner@gmail.com> | 2010-01-27 12:44:33 -0600 |
| commit | 9e3e1b3f24e2ba47f675ecbfc44c269323637985 (patch) | |
| tree | 93ec570453a4035ae1d01c29b9682a9e1e201b9d /actionpack/lib | |
| parent | 133f6011d08ee043dcb5ae95bb441a81f6206bd9 (diff) | |
| download | rails-9e3e1b3f24e2ba47f675ecbfc44c269323637985.tar.gz rails-9e3e1b3f24e2ba47f675ecbfc44c269323637985.tar.bz2 rails-9e3e1b3f24e2ba47f675ecbfc44c269323637985.zip | |
fixing last merge breakage
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_view/helpers/ajax_helper.rb | 10 | ||||
| -rw-r--r-- | actionpack/lib/action_view/helpers/javascript_helper.rb | 3 |
2 files changed, 0 insertions, 13 deletions
diff --git a/actionpack/lib/action_view/helpers/ajax_helper.rb b/actionpack/lib/action_view/helpers/ajax_helper.rb index f6c9952031..e8dd960e6b 100644 --- a/actionpack/lib/action_view/helpers/ajax_helper.rb +++ b/actionpack/lib/action_view/helpers/ajax_helper.rb @@ -493,16 +493,6 @@ module ActionView 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) || {} diff --git a/actionpack/lib/action_view/helpers/javascript_helper.rb b/actionpack/lib/action_view/helpers/javascript_helper.rb index 58a92387b5..ee6481b86d 100644 --- a/actionpack/lib/action_view/helpers/javascript_helper.rb +++ b/actionpack/lib/action_view/helpers/javascript_helper.rb @@ -215,10 +215,7 @@ 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 |