From 516dc2c0f16cf187f981b5e8648a7f7f1b31d190 Mon Sep 17 00:00:00 2001 From: Thomas Fuchs Date: Wed, 28 Sep 2005 08:20:47 +0000 Subject: Update script.aculo.us to 1.5_rc2, and Prototype to 1.4.0_pre7 git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2386 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_view/helpers/asset_tag_helper.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'actionpack/lib/action_view/helpers/asset_tag_helper.rb') diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb index b5f630aae0..61a0f0b45a 100644 --- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb +++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb @@ -51,7 +51,12 @@ module ActionView # def javascript_include_tag(*sources) options = sources.last.is_a?(Hash) ? sources.pop.stringify_keys : { } - sources = ['prototype', 'effects', 'controls', 'dragdrop'] if sources.first == :defaults + if sources.first == :defaults + sources = ['prototype', 'scriptaculous'] + if defined?(RAILS_ROOT) and File.exists?("#{RAILS_ROOT}/public/javascripts/application.js") + sources << 'application' + end + end sources.collect { |source| source = javascript_path(source) content_tag("script", "", { "type" => "text/javascript", "src" => source }.merge(options)) -- cgit v1.2.3