diff options
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_view/helpers/url_helper.rb | 4 | ||||
| -rw-r--r-- | actionpack/test/template/url_helper_test.rb | 16 |
3 files changed, 11 insertions, 11 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 18ea6b9b4c..dca6e65f46 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Removed the default border on link_image_to (it broke xhtml strict) -- can be specified with :border => 0 #517 [?/caleb] + * Fixed that form helpers would treat string and symbol keys differently in html_options (and possibly create duplicate entries) #112 [bitsweat] * Fixed that broken pipe errors (clients disconnecting in mid-request) could bring down a fcgi process diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb index 901374d877..6c5e338e54 100644 --- a/actionpack/lib/action_view/helpers/url_helper.rb +++ b/actionpack/lib/action_view/helpers/url_helper.rb @@ -39,7 +39,7 @@ module ActionView # # * <tt>:alt</tt> - If no alt text is given, the file name part of the +src+ is used (capitalized and without the extension) # * <tt>:size</tt> - Supplied as "XxY", so "30x45" becomes width="30" and height="45" - # * <tt>:border</tt> - Is set to 0 by default + # * <tt>:border</tt> - Draws a border around the link # * <tt>:align</tt> - Sets the alignment, no special features # # The +src+ can be supplied as a... @@ -70,8 +70,6 @@ module ActionView if html_options["border"] image_options["border"] = html_options["border"] html_options.delete "border" - else - image_options["border"] = "0" end if html_options["align"] diff --git a/actionpack/test/template/url_helper_test.rb b/actionpack/test/template/url_helper_test.rb index 379db0b9b7..47241bd09f 100644 --- a/actionpack/test/template/url_helper_test.rb +++ b/actionpack/test/template/url_helper_test.rb @@ -29,21 +29,21 @@ class UrlHelperTest < Test::Unit::TestCase ) end - def test_link_to_image + def test_link_image_to assert_equal( "<a href=\"http://www.world.com\"><img alt=\"Rss\" border=\"0\" height=\"45\" src=\"/images/rss.png\" width=\"30\" /></a>", - link_to_image("rss", "http://www.world.com", "size" => "30x45") + link_image_to("rss", "http://www.world.com", "size" => "30x45", "border" => "0") ) assert_equal( - "<a class=\"admin\" href=\"http://www.world.com\"><img alt=\"Feed\" border=\"0\" height=\"45\" src=\"/images/rss.gif\" width=\"30\" /></a>", - link_to_image("rss.gif", "http://www.world.com", "size" => "30x45", "alt" => "Feed", "class" => "admin") + "<a class=\"admin\" href=\"http://www.world.com\"><img alt=\"Feed\" height=\"45\" src=\"/images/rss.gif\" width=\"30\" /></a>", + link_image_to("rss.gif", "http://www.world.com", "size" => "30x45", "alt" => "Feed", "class" => "admin") ) - assert_equal link_to_image("rss", "http://www.world.com", "size" => "30x45"), - link_to_image("rss", "http://www.world.com", :size => "30x45") - assert_equal link_to_image("rss.gif", "http://www.world.com", "size" => "30x45", "alt" => "Feed", "class" => "admin"), - link_to_image("rss.gif", "http://www.world.com", :size => "30x45", :alt => "Feed", :class => "admin") + assert_equal link_image_to("rss", "http://www.world.com", "size" => "30x45"), + link_image_to("rss", "http://www.world.com", :size => "30x45") + assert_equal link_image_to("rss.gif", "http://www.world.com", "size" => "30x45", "alt" => "Feed", "class" => "admin"), + link_image_to("rss.gif", "http://www.world.com", :size => "30x45", :alt => "Feed", :class => "admin") end def test_link_unless_current |