diff options
-rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
-rw-r--r-- | actionpack/lib/action_view/helpers/text_helper.rb | 2 | ||||
-rw-r--r-- | actionpack/test/template/text_helper_test.rb | 3 |
3 files changed, 6 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 2d772dc119..1dad31d9e6 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Make auto_link match urls with a port number specified. [Marcel Molina Jr.] + * Added support for toggling visual effects to ScriptaculousHelper::visual_effect, #3323. [Thomas Fuchs] * Update to script.aculo.us to 1.5.0 rev. 3343 [Thomas Fuchs] diff --git a/actionpack/lib/action_view/helpers/text_helper.rb b/actionpack/lib/action_view/helpers/text_helper.rb index 2c38ffb345..1b1ca386c2 100644 --- a/actionpack/lib/action_view/helpers/text_helper.rb +++ b/actionpack/lib/action_view/helpers/text_helper.rb @@ -324,7 +324,7 @@ module ActionView (?:www\.) # www.* ) ( - ([\w]+[=?&\/.-]?)* # url segment + ([\w]+:?[=?&\/.-]?)* # url segment \w+[\/]? # url tail (?:\#\w*)? # trailing anchor ) diff --git a/actionpack/test/template/text_helper_test.rb b/actionpack/test/template/text_helper_test.rb index 5bfe0709d9..37c81e12a6 100644 --- a/actionpack/test/template/text_helper_test.rb +++ b/actionpack/test/template/text_helper_test.rb @@ -128,6 +128,8 @@ class TextHelperTest < Test::Unit::TestCase link3_result = %{<a href="#{link3_raw}">#{link3_raw}</a>} link4_raw = 'http://foo.example.com/controller/action?parm=value&p2=v2#anchor123' link4_result = %{<a href="#{link4_raw}">#{link4_raw}</a>} + link5_raw = 'http://foo.example.com:3000/controller/action' + link5_result = %{<a href="#{link5_raw}">#{link5_raw}</a>} assert_equal %(hello #{email_result}), auto_link("hello #{email_raw}", :email_addresses) assert_equal %(Go to #{link_result}), auto_link("Go to #{link_raw}", :urls) @@ -152,6 +154,7 @@ class TextHelperTest < Test::Unit::TestCase assert_equal %(<p>Go to #{link3_result}. seriously, #{link3_result}? i think I'll say hello to #{email_result}. instead.</p>), auto_link(%(<p>Go to #{link3_raw}. seriously, #{link3_raw}? i think I'll say hello to #{email_raw}. instead.</p>)) assert_equal %(<p>Link #{link4_result}</p>), auto_link("<p>Link #{link4_raw}</p>") assert_equal %(<p>#{link4_result} Link</p>), auto_link("<p>#{link4_raw} Link</p>") + assert_equal %(<p>#{link5_result} Link</p>), auto_link("<p>#{link5_raw} Link</p>") end def test_auto_link_at_eol |