From cc35d5c9e7049e62517642daf67d756312c5a5d2 Mon Sep 17 00:00:00 2001 From: Xavier Noria Date: Fri, 29 Apr 2011 22:14:22 +0200 Subject: JavaScript expansions are ignored if the application uses the asset pipeline, warn the user --- .../lib/rails/generators/rails/app/templates/config/application.rb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'railties') diff --git a/railties/lib/rails/generators/rails/app/templates/config/application.rb b/railties/lib/rails/generators/rails/app/templates/config/application.rb index ff8e6e5f3e..6b2aa97faa 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/application.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb @@ -39,6 +39,10 @@ module <%= app_const_base %> # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] # config.i18n.default_locale = :de + # Please note that JavaScript expansions are *ignored altogether* if the asset + # pipeline is enabled (see config.asset.enabled below). Put your defaults in + # app/assets/javascripts/application.js in that case. + # # JavaScript files you want as :defaults (application.js is always included). <% if options[:skip_javascript] -%> config.action_view.javascript_expansions[:defaults] = %w() -- cgit v1.2.3