kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

fix broken format in ActionView::Helpers::AssetTagHelper [ci skip]

Browse source
This commit is contained in:
Francesco Rodriguez 2013-04-04 16:52:39 -05:00
parent 2a16e159ab
commit 4997831a6d
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
actionpack/lib/action_view/helpers/asset_tag_helper.rb
View file

@ -14,7 +14,6 @@ module ActionView
# # => <img alt="Rails" src="/assets/rails.png" /> # # => <img alt="Rails" src="/assets/rails.png" />
# stylesheet_link_tag("application") # stylesheet_link_tag("application")
# # => <link href="/assets/application.css?body=1" media="screen" rel="stylesheet" /> # # => <link href="/assets/application.css?body=1" media="screen" rel="stylesheet" />
#
module AssetTagHelper module AssetTagHelper
extend ActiveSupport::Concern extend ActiveSupport::Concern
@ -50,7 +49,6 @@ module ActionView
# #
# javascript_include_tag "http://www.example.com/xmlhr.js" # javascript_include_tag "http://www.example.com/xmlhr.js"
# # => <script src="http://www.example.com/xmlhr.js"></script> # # => <script src="http://www.example.com/xmlhr.js"></script>
#
def javascript_include_tag(*sources) def javascript_include_tag(*sources)
options = sources.extract_options!.stringify_keys options = sources.extract_options!.stringify_keys
path_options = options.extract!('protocol').symbolize_keys path_options = options.extract!('protocol').symbolize_keys
@ -88,7 +86,6 @@ module ActionView
# stylesheet_link_tag "random.styles", "/css/stylish" # stylesheet_link_tag "random.styles", "/css/stylish"
# # => <link href="/assets/random.styles" media="screen" rel="stylesheet" /> # # => <link href="/assets/random.styles" media="screen" rel="stylesheet" />
# # <link href="/css/stylish.css" media="screen" rel="stylesheet" /> # # <link href="/css/stylish.css" media="screen" rel="stylesheet" />
#
def stylesheet_link_tag(*sources) def stylesheet_link_tag(*sources)
options = sources.extract_options!.stringify_keys options = sources.extract_options!.stringify_keys
path_options = options.extract!('protocol').symbolize_keys path_options = options.extract!('protocol').symbolize_keys
@ -109,10 +106,13 @@ module ActionView
# +url_options+. You can modify the LINK tag itself in +tag_options+. # +url_options+. You can modify the LINK tag itself in +tag_options+.
# #
# ==== Options # ==== Options
#
# * <tt>:rel</tt> - Specify the relation of this link, defaults to "alternate" # * <tt>:rel</tt> - Specify the relation of this link, defaults to "alternate"
# * <tt>:type</tt> - Override the auto-generated mime type # * <tt>:type</tt> - Override the auto-generated mime type
# * <tt>:title</tt> - Specify the title of the link, defaults to the +type+ # * <tt>:title</tt> - Specify the title of the link, defaults to the +type+
# #
# ==== Examples
#
# auto_discovery_link_tag # auto_discovery_link_tag
# # => <link rel="alternate" type="application/rss+xml" title="RSS" href="http://www.currenthost.com/controller/action" /> # # => <link rel="alternate" type="application/rss+xml" title="RSS" href="http://www.currenthost.com/controller/action" />
# auto_discovery_link_tag(:atom) # auto_discovery_link_tag(:atom)
@ -148,9 +148,12 @@ module ActionView
# you can override "rel" and "type". # you can override "rel" and "type".
# #
# ==== Options # ==== Options
#
# * <tt>:rel</tt> - Specify the relation of this link, defaults to 'shortcut icon' # * <tt>:rel</tt> - Specify the relation of this link, defaults to 'shortcut icon'
# * <tt>:type</tt> - Override the auto-generated mime type, defaults to 'image/vnd.microsoft.icon' # * <tt>:type</tt> - Override the auto-generated mime type, defaults to 'image/vnd.microsoft.icon'
# #
# ==== Examples
#
# favicon_link_tag '/myicon.ico' # favicon_link_tag '/myicon.ico'
# # => <link href="/assets/favicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon" /> # # => <link href="/assets/favicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon" />
# #
@ -160,7 +163,6 @@ module ActionView
# #
# favicon_link_tag '/mb-icon.png', rel: 'apple-touch-icon', type: 'image/png' # favicon_link_tag '/mb-icon.png', rel: 'apple-touch-icon', type: 'image/png'
# # => <link href="/assets/mb-icon.png" rel="apple-touch-icon" type="image/png" /> # # => <link href="/assets/mb-icon.png" rel="apple-touch-icon" type="image/png" />
#
def favicon_link_tag(source='favicon.ico', options={}) def favicon_link_tag(source='favicon.ico', options={})
tag('link', { tag('link', {
:rel => 'shortcut icon', :rel => 'shortcut icon',
@ -173,6 +175,7 @@ module ActionView
# path or a file. # path or a file.
# #
# ==== Options # ==== Options
#
# You can add HTML attributes using the +options+. The +options+ supports # You can add HTML attributes using the +options+. The +options+ supports
# three additional keys for convenience and conformance: # three additional keys for convenience and conformance:
# #
@ -250,6 +253,8 @@ module ActionView
# width="30" and height="45". <tt>:size</tt> will be ignored if the # width="30" and height="45". <tt>:size</tt> will be ignored if the
# value is not in the correct format. # value is not in the correct format.
# #
# ==== Examples
#
# video_tag("trailer") # video_tag("trailer")
# # => <video src="/videos/trailer" /> # # => <video src="/videos/trailer" />
# video_tag("trailer.ogg") # video_tag("trailer.ogg")