From 48739f3a499452969f3a59ee5ebc4f02e429ea0a Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 12 Mar 2005 16:18:29 +0000 Subject: [PATCH] Respect :onclick in link_to_toggle_display git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@891 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_view/helpers/javascript_helper.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/actionpack/lib/action_view/helpers/javascript_helper.rb b/actionpack/lib/action_view/helpers/javascript_helper.rb index 7e85519345..d072546a63 100644 --- a/actionpack/lib/action_view/helpers/javascript_helper.rb +++ b/actionpack/lib/action_view/helpers/javascript_helper.rb @@ -5,10 +5,11 @@ module Helpers # You must call <%= define_javascript_functions %> in your application before using these helpers. module JavascriptHelper def link_to_toggle_display(name, tags, html_options = {}) + html_options.symbolize_keys! toggle_functions = [ tags ].flatten.collect { |tag| "toggle_display_by_id('#{tag}'); " }.join content_tag( "a", name, - html_options.symbolize_keys.merge(:href => "#", :onclick => "#{toggle_functions}; #{html_options['onclick']}; return false;") + html_options.merge(:href => "#", :onclick => "#{toggle_functions}#{html_options[:onclick]}; return false;") ) end -- GitLab