diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2010-12-22 21:36:21 -0200 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2010-12-22 21:53:24 -0200 |
| commit | 5853583f9b810d7186ad36801b3a97ed49f77799 (patch) | |
| tree | ddeb23ed8d409b110966326f6d4a0651f485c151 /actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb | |
| parent | 0b5222fa45ff8da340ca4f086d735e97b7fb7326 (diff) | |
| download | rails-5853583f9b810d7186ad36801b3a97ed49f77799.tar.gz rails-5853583f9b810d7186ad36801b3a97ed49f77799.tar.bz2 rails-5853583f9b810d7186ad36801b3a97ed49f77799.zip | |
Allow registering javascript/stylesheet_expansions to existing symbols
Diffstat (limited to 'actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb')
| -rw-r--r-- | actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb b/actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb index 6581e1d6f2..c95808a219 100644 --- a/actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb +++ b/actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb @@ -59,7 +59,10 @@ module ActionView # <script type="text/javascript" src="/javascripts/body.js"></script> # <script type="text/javascript" src="/javascripts/tail.js"></script> def register_javascript_expansion(expansions) - JavascriptIncludeTag.expansions.merge!(expansions) + js_expansions = JavascriptIncludeTag.expansions + expansions.each do |key, values| + js_expansions[key] = (js_expansions[key] || []) | Array(values) if values + end end end @@ -170,4 +173,4 @@ module ActionView end end -end
\ No newline at end of file +end |