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

Merge pull request #15732 from kuldeepaggarwal/correct-assets-ouput

Browse source 
[ci skip] correct output for asset_helper methods
This commit is contained in:
Rafael Mendonça França 2014-06-23 14:41:40 -03:00
commit 0e09875a67
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
actionview/lib/action_view/helpers/asset_url_helper.rb
View file

@ -7,10 +7,10 @@ module ActionView
# urls. # urls.
# #
# image_path("rails.png") # image_path("rails.png")
# # => "/images/rails.png" # # => "/assets/rails.png"
# #
# image_url("rails.png") # image_url("rails.png")
# # => "http://www.example.com/images/rails.png" # # => "http://www.example.com/assets/rails.png"
# #
# === Using asset hosts # === Using asset hosts
# #
@ -155,7 +155,7 @@ module ActionView
# #
# All other options provided are forwarded to +asset_path+ call. # All other options provided are forwarded to +asset_path+ call.
# #
# asset_url "application.js" # => http://example.com/application.js # asset_url "application.js" # => http://example.com/assets/application.js
# asset_url "application.js", host: "http://cdn.example.com" # => http://cdn.example.com/assets/application.js # asset_url "application.js", host: "http://cdn.example.com" # => http://cdn.example.com/assets/application.js
# #
def asset_url(source, options = {}) def asset_url(source, options = {})
@ -236,8 +236,8 @@ module ActionView
# Full paths from the document root will be passed through. # Full paths from the document root will be passed through.
# Used internally by +javascript_include_tag+ to build the script path. # Used internally by +javascript_include_tag+ to build the script path.
# #
# javascript_path "xmlhr" # => /javascripts/xmlhr.js # javascript_path "xmlhr" # => /assets/xmlhr.js
# javascript_path "dir/xmlhr.js" # => /javascripts/dir/xmlhr.js # javascript_path "dir/xmlhr.js" # => /assets/dir/xmlhr.js
# javascript_path "/dir/xmlhr" # => /dir/xmlhr.js # javascript_path "/dir/xmlhr" # => /dir/xmlhr.js
# javascript_path "http://www.example.com/js/xmlhr" # => http://www.example.com/js/xmlhr # javascript_path "http://www.example.com/js/xmlhr" # => http://www.example.com/js/xmlhr
# javascript_path "http://www.example.com/js/xmlhr.js" # => http://www.example.com/js/xmlhr.js # javascript_path "http://www.example.com/js/xmlhr.js" # => http://www.example.com/js/xmlhr.js
@ -258,8 +258,8 @@ module ActionView
# Full paths from the document root will be passed through. # Full paths from the document root will be passed through.
# Used internally by +stylesheet_link_tag+ to build the stylesheet path. # Used internally by +stylesheet_link_tag+ to build the stylesheet path.
# #
# stylesheet_path "style" # => /stylesheets/style.css # stylesheet_path "style" # => /assets/style.css
# stylesheet_path "dir/style.css" # => /stylesheets/dir/style.css # stylesheet_path "dir/style.css" # => /assets/dir/style.css
# stylesheet_path "/dir/style.css" # => /dir/style.css # stylesheet_path "/dir/style.css" # => /dir/style.css
# stylesheet_path "http://www.example.com/css/style" # => http://www.example.com/css/style # stylesheet_path "http://www.example.com/css/style" # => http://www.example.com/css/style
# stylesheet_path "http://www.example.com/css/style.css" # => http://www.example.com/css/style.css # stylesheet_path "http://www.example.com/css/style.css" # => http://www.example.com/css/style.css
@ -279,9 +279,9 @@ module ActionView
# Full paths from the document root will be passed through. # Full paths from the document root will be passed through.
# Used internally by +image_tag+ to build the image path: # Used internally by +image_tag+ to build the image path:
# #
# image_path("edit") # => "/images/edit" # image_path("edit") # => "/assets/edit"
# image_path("edit.png") # => "/images/edit.png" # image_path("edit.png") # => "/assets/edit.png"
# image_path("icons/edit.png") # => "/images/icons/edit.png" # image_path("icons/edit.png") # => "/assets/icons/edit.png"
# image_path("/icons/edit.png") # => "/icons/edit.png" # image_path("/icons/edit.png") # => "/icons/edit.png"
# image_path("http://www.example.com/img/edit.png") # => "http://www.example.com/img/edit.png" # image_path("http://www.example.com/img/edit.png") # => "http://www.example.com/img/edit.png"
# #

10
actionview/lib/action_view/helpers/form_tag_helper.rb
View file

@ -508,19 +508,19 @@ module ActionView
# #
# ==== Examples # ==== Examples
# image_submit_tag("login.png") # image_submit_tag("login.png")
# # => <input alt="Login" src="/images/login.png" type="image" /> # # => <input alt="Login" src="/assets/login.png" type="image" />
# #
# image_submit_tag("purchase.png", disabled: true) # image_submit_tag("purchase.png", disabled: true)
# # => <input alt="Purchase" disabled="disabled" src="/images/purchase.png" type="image" /> # # => <input alt="Purchase" disabled="disabled" src="/assets/purchase.png" type="image" />
# #
# image_submit_tag("search.png", class: 'search_button', alt: 'Find') # image_submit_tag("search.png", class: 'search_button', alt: 'Find')
# # => <input alt="Find" class="search_button" src="/images/search.png" type="image" /> # # => <input alt="Find" class="search_button" src="/assets/search.png" type="image" />
# #
# image_submit_tag("agree.png", disabled: true, class: "agree_disagree_button") # image_submit_tag("agree.png", disabled: true, class: "agree_disagree_button")
# # => <input alt="Agree" class="agree_disagree_button" disabled="disabled" src="/images/agree.png" type="image" /> # # => <input alt="Agree" class="agree_disagree_button" disabled="disabled" src="/assets/agree.png" type="image" />
# #
# image_submit_tag("save.png", data: { confirm: "Are you sure?" }) # image_submit_tag("save.png", data: { confirm: "Are you sure?" })
# # => <input alt="Save" src="/images/save.png" data-confirm="Are you sure?" type="image" /> # # => <input alt="Save" src="/assets/save.png" data-confirm="Are you sure?" type="image" />
def image_submit_tag(source, options = {}) def image_submit_tag(source, options = {})
options = options.stringify_keys options = options.stringify_keys
tag :input, { "alt" => image_alt(source), "type" => "image", "src" => path_to_image(source) }.update(options) tag :input, { "alt" => image_alt(source), "type" => "image", "src" => path_to_image(source) }.update(options)