Load helpers in alphabetical order for consistency. Resolve cyclic javascript_helper dependency. Closes #6132, closes #6178.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5095 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

actionpack/CHANGELOG

@@ -1,5 +1,7 @@
 *SVN*
 
+* Load helpers in alphabetical order for consistency. Resolve cyclic javascript_helper dependency.  #6132, #6178 [choonkeat@gmail.com]
+
 * Skip params with empty names, such as the &=Save query string from <input type="submit"/>.  #2569 [manfred, raphinou@yahoo.com]
 
 * Fix assert_tag so that :content => "foo" does not match substrings, but only exact strings. Use :content => /foo/ to match substrings. #2799 [Eric Hodel]

actionpack/lib/action_view/base.rb

@@ -200,7 +200,7 @@ module ActionView #:nodoc:
     end
 
     def self.load_helpers(helper_dir)#:nodoc:
-      Dir.foreach(helper_dir) do |helper_file| 
+      Dir.entries(helper_dir).sort.each do |helper_file|
         next unless helper_file =~ /^([a-z][a-z_]*_helper).rb$/
         require File.join(helper_dir, $1)
         helper_module_name = $1.camelize

actionpack/lib/action_view/helpers/prototype_helper.rb

@@ -1,4 +1,3 @@
-require File.dirname(__FILE__) + '/javascript_helper'
 require 'set'
 
 module ActionView
@@ -926,3 +925,5 @@ module ActionView
     end
   end
 end
+
+require File.dirname(__FILE__) + '/javascript_helper'