aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2011-08-25 14:18:16 -0700
committerSantiago Pastorino <santiago@wyeworks.com>2011-08-25 14:18:16 -0700
commitbad6803570f5f3b09d277b15c9f272bfae7408da (patch)
tree7f3ebd7bfc61b2c58b0c8b468a3a4cd10965b71f /actionpack
parent25ee30961a1785363e4329db569008623f022332 (diff)
parentf5472a3898d0a06edbc3a82b437de9989cf531ff (diff)
downloadrails-bad6803570f5f3b09d277b15c9f272bfae7408da.tar.gz
rails-bad6803570f5f3b09d277b15c9f272bfae7408da.tar.bz2
rails-bad6803570f5f3b09d277b15c9f272bfae7408da.zip
Merge pull request #2696 from guilleiguaran/string-keys-sprockets-helpers
Removing redundant stringify_keys in Sprockets helpers
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/sprockets/helpers/rails_helper.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb
index a69cc8a29e..7ad4d30d9e 100644
--- a/actionpack/lib/sprockets/helpers/rails_helper.rb
+++ b/actionpack/lib/sprockets/helpers/rails_helper.rb
@@ -26,10 +26,10 @@ module Sprockets
sources.collect do |source|
if debug && asset = asset_paths.asset_for(source, 'js')
asset.to_a.map { |dep|
- javascript_include_tag(dep, options.stringify_keys.merge!({ :debug => false, :body => true }))
+ javascript_include_tag(dep, options.merge({ :debug => false, :body => true }))
}
else
- super(source.to_s, { 'src' => asset_path(source, 'js', body) }.merge!(options.stringify_keys))
+ super(source.to_s, { :src => asset_path(source, 'js', body) }.merge!(options))
end
end.join("\n").html_safe
end
@@ -42,10 +42,10 @@ module Sprockets
sources.collect do |source|
if debug && asset = asset_paths.asset_for(source, 'css')
asset.to_a.map { |dep|
- stylesheet_link_tag(dep, options.stringify_keys.merge!({ :debug => false, :body => true }))
+ stylesheet_link_tag(dep, options.merge({ :debug => false, :body => true }))
}
else
- super(source.to_s, { 'href' => asset_path(source, 'css', body, :request) }.merge!(options.stringify_keys))
+ super(source.to_s, { :href => asset_path(source, 'css', body, :request) }.merge!(options))
end
end.join("\n").html_safe
end