diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-12-31 03:51:43 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-12-31 03:51:43 +0000 |
| commit | 89d8afa2c4f256ffb84b6c9e521546b5dd3e60d8 (patch) | |
| tree | 94891dfc441d91381d1e4aef944c7936ffcf079e /actionpack/lib | |
| parent | 341d34cd50ab1d807a9d515058d1da8fe75deb01 (diff) | |
| download | rails-89d8afa2c4f256ffb84b6c9e521546b5dd3e60d8.tar.gz rails-89d8afa2c4f256ffb84b6c9e521546b5dd3e60d8.tar.bz2 rails-89d8afa2c4f256ffb84b6c9e521546b5dd3e60d8.zip | |
Added that JavaScriptHelper#link_to_function will honor existing :onclick definitions when adding the function call [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3365 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_view/helpers/javascript_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/javascript_helper.rb b/actionpack/lib/action_view/helpers/javascript_helper.rb index 7dccecda13..3be96db001 100644 --- a/actionpack/lib/action_view/helpers/javascript_helper.rb +++ b/actionpack/lib/action_view/helpers/javascript_helper.rb @@ -53,7 +53,7 @@ module ActionView "a", name, html_options.merge({ :href => html_options[:href] || "#", - :onclick => "#{function};#{html_options[:onclick] ? " #{html_options[:onclick]};" : ""} return false;" + :onclick => (html_options[:onclick] ? "#{html_options[:onclick]}; " : "") + "#{function}; return false;" }) ) end |