github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

:href should be comming in through html_options and not options

Browse Source
This commit is contained in:
Erik St. Martin
2010-01-26 14:38:57 -05:00
committed by Stefan Penner
parent f661a3bc59
commit c0f63883ea
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
actionpack/lib/action_view/helpers/ajax_helper.rb
View File

@@ -304,7 +304,7 @@ module ActionView
end
attributes.merge!(html_options)
href = options[:href].nil? ? "#" : options[:href]
href = html_options[:href].nil? ? "#" : html_options[:href]
attributes.merge!(:href => href)
content_tag(:a, name, attributes)

2
actionpack/test/template/ajax_helper_test.rb
View File

@@ -103,7 +103,7 @@ class AjaxHelperTest < AjaxHelperBaseTest
test "link_to_remote using explicit :href" do
expected = %(<a href=\"http://www.example.com/testhref\" data-remote=\"true\" data-url=\"http://www.example.com/whatnot\" data-condition=\"$('foo').val() == true\">Remote outauthor</a>)
assert_dom_equal expected, link_to_remote("Remote outauthor", :href => 'http://www.example.com/testhref', :url => { :action => "whatnot" }, :condition => '$(\'foo\').val() == true')
assert_dom_equal expected, link_to_remote("Remote outauthor", {:url => { :action => "whatnot" }, :condition => '$(\'foo\').val() == true'}, :href => 'http://www.example.com/testhref')
end
test "link_to_remote using :submit" do