diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2010-09-17 00:15:10 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2010-09-19 14:41:32 -0700 |
| commit | 88a82bcb2dbb1f65382583d1fad7ad0c72e0022f (patch) | |
| tree | 484e8fdcb55a20994bedb64a093a897a7ee7e4ae /actionpack/lib | |
| parent | 3c9bf6e1dc3066e32651c955c6e237488115354d (diff) | |
| download | rails-88a82bcb2dbb1f65382583d1fad7ad0c72e0022f.tar.gz rails-88a82bcb2dbb1f65382583d1fad7ad0c72e0022f.tar.bz2 rails-88a82bcb2dbb1f65382583d1fad7ad0c72e0022f.zip | |
application.js should be the last file on javascript_include_tag(:all)
Diffstat (limited to 'actionpack/lib')
| -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 fdc40c8f2e..687cb83d75 100644 --- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb +++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb @@ -827,7 +827,7 @@ module ActionView def expand_javascript_sources(sources, recursive = false) if sources.include?(:all) - all_javascript_files = collect_asset_files(config.javascripts_dir, ('**' if recursive), '*.js') + all_javascript_files = (collect_asset_files(config.javascripts_dir, ('**' if recursive), '*.js') - ['application']) << 'application' ((determine_source(:defaults, @@javascript_expansions).dup & all_javascript_files) + all_javascript_files).uniq else expanded_sources = sources.collect do |source| |