Skip to content
Browse files

Load helpers in alphabetical order for consistency. Resolve cyclic ja…

…vascript_helper dependency. Closes #6132, closes #6178.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5095 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 7661c2b commit 89840c40ceb54855fa81e641586abba04c3e35cb @jeremy jeremy committed Sep 12, 2006
View
2 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]
View
2 actionpack/lib/action_view/base.rb
@@ -200,7 +200,7 @@ class ObjectWrapper < Struct.new(:value) #: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
View
3 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 @@ def initialize(generator, pattern)
end
end
end
+
+require File.dirname(__FILE__) + '/javascript_helper'

0 comments on commit 89840c4

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