Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

adds a default source to #apple_touch_icon_link_tag

  • Loading branch information...
commit ec8610cfdc32d0fe816fb22405e00ef1b6c90d73 1 parent eed89e6
@fxn fxn authored
View
18 actionpack/lib/action_view/helpers/asset_tag_helper.rb
@@ -518,24 +518,30 @@ def stylesheet_link_tag(*sources)
# <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" />
+ #
+ # You can specify a different icon file:
+ #
+ # <%= apple_touch_icon_link_tag "my_site.png" %>
#
- # The source argument is passed to +image_path+ as is.
- def apple_touch_icon_link_tag(source)
+ # 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
View
1  actionpack/test/template/asset_tag_helper_test.rb
@@ -165,6 +165,7 @@ def teardown
}
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" />)
}
Please sign in to comment.
Something went wrong with that request. Please try again.