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
rails · Mar 4, 2007 · a752099 · a752099
1 parent f1e08b3
commit a752099
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/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