diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2007-01-28 07:16:55 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2007-01-28 07:16:55 +0000 |
| commit | 0eacdcf9a3e37e05f47a4ded7f0a4aff3b65fbe4 (patch) | |
| tree | 74705adf7f9a35c750f74657f0c4a29a6dcce5ff /actionpack/lib/action_view/helpers/prototype_helper.rb | |
| parent | 4ac332fa9a16ae86b948251e372999b9f4618dec (diff) | |
| download | rails-0eacdcf9a3e37e05f47a4ded7f0a4aff3b65fbe4.tar.gz rails-0eacdcf9a3e37e05f47a4ded7f0a4aff3b65fbe4.tar.bz2 rails-0eacdcf9a3e37e05f47a4ded7f0a4aff3b65fbe4.zip | |
Use a consistent load path to avoid double requires. Fix some scattered Ruby warnings.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6057 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_view/helpers/prototype_helper.rb')
| -rw-r--r-- | actionpack/lib/action_view/helpers/prototype_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/helpers/prototype_helper.rb b/actionpack/lib/action_view/helpers/prototype_helper.rb index 43d04baf8d..ed3f7b7d7f 100644 --- a/actionpack/lib/action_view/helpers/prototype_helper.rb +++ b/actionpack/lib/action_view/helpers/prototype_helper.rb @@ -860,7 +860,7 @@ module ActionView add_variable_assignment!(options[:variable]) if options[:variable] append_enumerable_function!("#{enumerable.to_s.camelize(:lower)}(#{method_args}function(#{yield_args}) {") # only yield as many params as were passed in the block - yield *options[:yield_args].collect { |p| JavaScriptVariableProxy.new(@generator, p) }[0..block.arity-1] + yield(*options[:yield_args].collect { |p| JavaScriptVariableProxy.new(@generator, p) }[0..block.arity-1]) add_return_statement! if options[:return] @generator << '});' end @@ -889,4 +889,4 @@ module ActionView end end -require File.dirname(__FILE__) + '/javascript_helper' +require 'action_view/helpers/javascript_helper' |