aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-09-08 17:54:16 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-09-08 17:54:16 +0000
commit079d8f402893dae8607bb7e272a6a038b840b4d2 (patch)
tree6e64b8bf5e6b286cbe30e56ea2eb86c13ae835ef /actionpack/lib
parent9053c4c83e4ff74e71b7e771a0b58a3cb45e53bc (diff)
downloadrails-079d8f402893dae8607bb7e272a6a038b840b4d2.tar.gz
rails-079d8f402893dae8607bb7e272a6a038b840b4d2.tar.bz2
rails-079d8f402893dae8607bb7e272a6a038b840b4d2.zip
Fixed that onclick would be overridden even when special features werent used
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2158 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_view/helpers/url_helper.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb
index 7ca1d0cd0b..2901d4f642 100644
--- a/actionpack/lib/action_view/helpers/url_helper.rb
+++ b/actionpack/lib/action_view/helpers/url_helper.rb
@@ -254,6 +254,8 @@ module ActionView
"#{post_javascript_function}return false;"
when popup
popup_javascript_function(popup) + 'return false;'
+ else
+ html_options["onclick"]
end
end