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

adds a default source to #apple_touch_icon_link_tag

Browse Source
This commit is contained in:
Xavier Noria
2010-04-07 13:19:55 -07:00
parent eed89e65b6
commit ec8610cfdc
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
actionpack/lib/action_view/helpers/asset_tag_helper.rb
View File

@@ -518,24 +518,30 @@ module ActionView
# <link href="/images/favicon.ico?4649789979" rel="shortcut icon" type="image/vnd.microsoft.icon" />
#
# The helper accepts an additional options hash where you can override "rel" and "type".
def favicon_link_tag(source=nil, options={})
def favicon_link_tag(source='/favicon.ico', options={})
tag('link', {
:rel => 'shortcut icon',
:type => 'image/vnd.microsoft.icon',
:href => image_path(source || '/favicon.ico')
:href => image_path(source)
}.merge(options.symbolize_keys))
end
# Returns a link tag for an icon targetted at iPod Touch, iPhone, and iPad.
#
# <%= apple_touch_icon_link_tag 'my_site.png' %>
# <%= apple_touch_icon_link_tag %>
#
# generates
#
# <link href="/images/my_site.png?4233872383" rel="apple-touch-icon" />
# <link href="/apple-touch-icon.png?4233872383" rel="apple-touch-icon" />
#
# The source argument is passed to +image_path+ as is.
def apple_touch_icon_link_tag(source)
# You can specify a different icon file:
#
# <%= apple_touch_icon_link_tag "my_site.png" %>
#
# That's passed to +image_path+ as is, so the example above would render
#
# <link href="/images/my_site.png?4233872383" rel="apple-touch-icon" />
def apple_touch_icon_link_tag(source='/apple-touch-icon.png')
tag('link', :rel => 'apple-touch-icon', :href => image_path(source))
end

1
actionpack/test/template/asset_tag_helper_test.rb
View File

@@ -165,6 +165,7 @@ class AssetTagHelperTest < ActionView::TestCase
}
AppleTouchIconLinkToTag = {
%(apple_touch_icon_link_tag) => %(<link href="/apple-touch-icon.png" rel="apple-touch-icon" />),
%(apple_touch_icon_link_tag 'my_site.png') => %(<link href="/images/my_site.png" rel="apple-touch-icon" />)
}