From 23b5c5522160928005b0aa949b3f9a894e2618aa Mon Sep 17 00:00:00 2001 From: Guillermo Iguaran Date: Wed, 24 Aug 2011 16:01:06 -0500 Subject: Preserve stylesheet_link_tag and javascript_include_tag options on debug --- actionpack/lib/sprockets/helpers/rails_helper.rb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'actionpack/lib') diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb index 931d7a93a4..53cc5ec019 100644 --- a/actionpack/lib/sprockets/helpers/rails_helper.rb +++ b/actionpack/lib/sprockets/helpers/rails_helper.rb @@ -26,7 +26,7 @@ module Sprockets sources.collect do |source| if debug && asset = asset_paths.asset_for(source, 'js') asset.to_a.map { |dep| - javascript_include_tag(dep, :debug => false, :body => true) + javascript_include_tag(dep, options.stringify_keys.merge!({ :debug => false, :body => true })) } else super(source.to_s, { 'src' => asset_path(source, 'js', body) }.merge!(options.stringify_keys)) @@ -38,15 +38,14 @@ 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, :media => media, :debug => false, :body => true) + stylesheet_link_tag(dep, options.stringify_keys.merge!({ :debug => false, :body => true })) } else - super(source.to_s, { 'href' => asset_path(source, 'css', body, :request), 'media' => media }.merge!(options.stringify_keys)) + super(source.to_s, { 'href' => asset_path(source, 'css', body, :request) }.merge!(options.stringify_keys)) end end.join("\n").html_safe end -- cgit v1.2.3