From c8b7ad1cc5f67b114d1b491dff4bd661b88df81d Mon Sep 17 00:00:00 2001 From: glorieux Date: Mon, 16 Dec 2013 12:13:18 +0100 Subject: Change favicon_link_tag helper mimetype from image/vnd.microsoft.icon to image/x-icon. Although the official IANA-registered MIME type for ICO files is image/vnd.microsoft.icon, registered in 2003, it was submitted to IANA by a third party and is not recognized by Microsoft products. The MIME type image/x-icon should be used since is the one recognized by the major browsers on the market. --- actionview/CHANGELOG.md | 15 +++++++++++++++ actionview/lib/action_view/helpers/asset_tag_helper.rb | 6 +++--- actionview/test/template/asset_tag_helper_test.rb | 6 +++--- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/actionview/CHANGELOG.md b/actionview/CHANGELOG.md index 8578b43d78..50ca64d536 100644 --- a/actionview/CHANGELOG.md +++ b/actionview/CHANGELOG.md @@ -1,3 +1,18 @@ +* Change `favicon_link_tag` default mimetype from `image/vnd.microsoft.icon` to + `image/x-icon`. + + Before: + + #=> favicon_link_tag 'myicon.ico' + + + After: + + #=> favicon_link_tag 'myicon.ico' + + + *Geoffroy Lorieux* + * Remove wrapping div with inline styles for hidden form fields. We are dropping HTML 4.01 and XHTML strict compliance since input tags directly diff --git a/actionview/lib/action_view/helpers/asset_tag_helper.rb b/actionview/lib/action_view/helpers/asset_tag_helper.rb index aa49f1edc1..413532826b 100644 --- a/actionview/lib/action_view/helpers/asset_tag_helper.rb +++ b/actionview/lib/action_view/helpers/asset_tag_helper.rb @@ -149,12 +149,12 @@ module ActionView # ==== Options # # * :rel - Specify the relation of this link, defaults to 'shortcut icon' - # * :type - Override the auto-generated mime type, defaults to 'image/vnd.microsoft.icon' + # * :type - Override the auto-generated mime type, defaults to 'image/x-icon' # # ==== Examples # # favicon_link_tag 'myicon.ico' - # # => + # # => # # Mobile Safari looks for a different tag, pointing to an image that # will be used if you add the page to the home screen of an iPod Touch, iPhone, or iPad. @@ -165,7 +165,7 @@ module ActionView def favicon_link_tag(source='favicon.ico', options={}) tag('link', { :rel => 'shortcut icon', - :type => 'image/vnd.microsoft.icon', + :type => 'image/x-icon', :href => path_to_image(source) }.merge!(options.symbolize_keys)) end diff --git a/actionview/test/template/asset_tag_helper_test.rb b/actionview/test/template/asset_tag_helper_test.rb index 3ca71d3376..651978ed80 100644 --- a/actionview/test/template/asset_tag_helper_test.rb +++ b/actionview/test/template/asset_tag_helper_test.rb @@ -195,9 +195,9 @@ class AssetTagHelperTest < ActionView::TestCase } FaviconLinkToTag = { - %(favicon_link_tag) => %(), - %(favicon_link_tag 'favicon.ico') => %(), - %(favicon_link_tag 'favicon.ico', :rel => 'foo') => %(), + %(favicon_link_tag) => %(), + %(favicon_link_tag 'favicon.ico') => %(), + %(favicon_link_tag 'favicon.ico', :rel => 'foo') => %(), %(favicon_link_tag 'favicon.ico', :rel => 'foo', :type => 'bar') => %(), %(favicon_link_tag 'mb-icon.png', :rel => 'apple-touch-icon', :type => 'image/png') => %() } -- cgit v1.2.3