Guest User

Untitled

a guest
Jan 23rd, 2018
60
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.20 KB | None | 0 0
  1. diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb
  2. index c50b030..f521787 100644
  3. --- a/actionpack/lib/sprockets/helpers/rails_helper.rb
  4. +++ b/actionpack/lib/sprockets/helpers/rails_helper.rb
  5. @@ -26,15 +26,10 @@ module Sprockets
  6. sources.collect do |source|
  7. if debug && asset = asset_paths.asset_for(source, 'js')
  8. asset.to_a.map { |dep|
  9. - javascript_include_tag(dep, :debug => false, :body => true)
  10. - }.join("\n").html_safe
  11. + javascript_include_tag(dep, options.stringify_keys.merge!({ :debug => false, :body => true }))
  12. + }
  13. else
  14. - tag_options = {
  15. - 'type' => "text/javascript",
  16. - 'src' => asset_path(source, 'js', body)
  17. - }.merge(options.stringify_keys)
  18. -
  19. - content_tag 'script', "", tag_options
  20. + super(source.to_s, options.stringify_keys.merge!('src' => asset_path(source, 'js', body)))
  21. end
  22. end.join("\n").html_safe
  23. end
  24. @@ -43,22 +38,14 @@ module Sprockets
  25. options = sources.extract_options!
  26. debug = options.key?(:debug) ? options.delete(:debug) : debug_assets?
  27. body = options.key?(:body) ? options.delete(:body) : false
  28. - media = options.key?(:media) ? options.delete(:media) : "screen"
  29.  
  30. sources.collect do |source|
  31. if debug && asset = asset_paths.asset_for(source, 'css')
  32. asset.to_a.map { |dep|
  33. - stylesheet_link_tag(dep, :media => media, :debug => false, :body => true)
  34. - }.join("\n").html_safe
  35. + stylesheet_link_tag(dep, options.stringify_keys.merge!({ :debug => false, :body => true }))
  36. + }
  37. else
  38. - tag_options = {
  39. - 'rel' => "stylesheet",
  40. - 'type' => "text/css",
  41. - 'media' => media,
  42. - 'href' => asset_path(source, 'css', body, :request)
  43. - }.merge(options.stringify_keys)
  44. -
  45. - tag 'link', tag_options
  46. + super(source.to_s, options.stringify_keys.merge!('href' => asset_path(source, 'css', body, :request)))
  47. end
  48. end.join("\n").html_safe
  49. end
Add Comment
Please, Sign In to add comment