Skip to content
Browse files

Sort asset sources for consistent results across filesystems. Closes #…

…7615.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6308 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent f1e08b3 commit a7520990827da336e3585557e575eb58c3c430ec @jeremy jeremy committed Mar 4, 2007
Showing with 2 additions and 2 deletions.
  1. +2 −2 actionpack/lib/action_view/helpers/asset_tag_helper.rb
View
4 actionpack/lib/action_view/helpers/asset_tag_helper.rb
@@ -374,7 +374,7 @@ def rewrite_asset_path!(source)
def expand_javascript_sources(sources)
case
when sources.include?(:all)
- all_javascript_files = Dir[File.join(JAVASCRIPTS_DIR, '*.js')].collect { |file| File.basename(file).split(".", 0).first }
+ all_javascript_files = Dir[File.join(JAVASCRIPTS_DIR, '*.js')].collect { |file| File.basename(file).split(".", 0).first }.sort
sources = ((@@javascript_default_sources.dup & all_javascript_files) + all_javascript_files).uniq
when sources.include?(:defaults)
@@ -391,7 +391,7 @@ def expand_javascript_sources(sources)
def expand_stylesheet_sources(sources)
if sources.first == :all
- sources = Dir[File.join(STYLESHEETS_DIR, '*.css')].collect { |file| File.basename(file).split(".", 1).first }
+ sources = Dir[File.join(STYLESHEETS_DIR, '*.css')].collect { |file| File.basename(file).split(".", 1).first }.sort
else
sources
end

0 comments on commit a752099

Please sign in to comment.
Something went wrong with that request. Please try again.