diff options
| author | Thomas Fuchs <thomas@fesch.at> | 2005-11-22 23:18:53 +0000 |
|---|---|---|
| committer | Thomas Fuchs <thomas@fesch.at> | 2005-11-22 23:18:53 +0000 |
| commit | d958f22ecc47f34aced7f5619be483d9686a26f0 (patch) | |
| tree | 817f8de1b3010b365e20bf2010f56949952c40f6 /actionpack/lib/action_view/helpers/asset_tag_helper.rb | |
| parent | bd5ace88b2cc8a56c33a8b44ca98de8cc15e0790 (diff) | |
| download | rails-d958f22ecc47f34aced7f5619be483d9686a26f0.tar.gz rails-d958f22ecc47f34aced7f5619be483d9686a26f0.tar.bz2 rails-d958f22ecc47f34aced7f5619be483d9686a26f0.zip | |
Make javascript_include_tag :default behave correctly with application.js, fixes #2986
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3164 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_view/helpers/asset_tag_helper.rb')
| -rw-r--r-- | actionpack/lib/action_view/helpers/asset_tag_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb index c98b7a3638..418092cf88 100644 --- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb +++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb @@ -60,7 +60,7 @@ module ActionView def javascript_include_tag(*sources) options = sources.last.is_a?(Hash) ? sources.pop.stringify_keys : { } if sources.first == :defaults - sources = @@javascript_default_sources + sources = @@javascript_default_sources.dup if defined?(RAILS_ROOT) and File.exists?("#{RAILS_ROOT}/public/javascripts/application.js") sources << 'application' end |