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

Merge pull request #2668 from guilleiguaran/debug-assets-media-type

Browse Source 
Debug assets shouldn't ignore media type for stylesheets. Closes #2625
This commit is contained in:
Santiago Pastorino
2011-08-24 07:46:04 -07:00
parent 52207ecc81 d133fd6d29
commit 23d8a980d2
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
actionpack/lib/sprockets/helpers/rails_helper.rb
View File

@@ -43,17 +43,18 @@ module Sprockets
options = sources.extract_options!
debug = options.key?(:debug) ? options.delete(:debug) : debug_assets?
body = options.key?(:body) ? options.delete(:body) : false
media = options.key?(:media) ? options.delete(:media) : "screen"
sources.collect do |source|
if debug && asset = asset_paths.asset_for(source, 'css')
asset.to_a.map { |dep|
stylesheet_link_tag(dep, :debug => false, :body => true)
stylesheet_link_tag(dep, :media => media, :debug => false, :body => true)
}.join("\n").html_safe
else
tag_options = {
'rel' => "stylesheet",
'type' => "text/css",
'media' => "screen",
'media' => media,
'href' => asset_path(source, 'css', body, :request)
}.merge(options.stringify_keys)

3
actionpack/test/template/sprockets_helper_test.rb
View File

@@ -200,6 +200,9 @@ class SprocketsHelperTest < ActionView::TestCase
@config.assets.debug = true
assert_match %r{<link href="/assets/style-[0-9a-f]+.css\?body=1" media="screen" rel="stylesheet" type="text/css" />\n<link href="/assets/application-[0-9a-f]+.css\?body=1" media="screen" rel="stylesheet" type="text/css" />},
stylesheet_link_tag(:application)
assert_match %r{<link href="/assets/style-[0-9a-f]+.css\?body=1" media="print" rel="stylesheet" type="text/css" />\n<link href="/assets/application-[0-9a-f]+.css\?body=1" media="print" rel="stylesheet" type="text/css" />},
stylesheet_link_tag(:application, :media => "print")
end
test "alternate asset prefix" do