diff options
Diffstat (limited to 'railties/lib/rails/generators/rails/app/templates/config/application.rb')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/application.rb | 4 |
1 files changed, 3 insertions, 1 deletions
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 7d63e99e05..00a23a7b89 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/application.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/application.rb @@ -40,8 +40,10 @@ module <%= app_const_base %> # config.i18n.default_locale = :de # JavaScript files you want as :defaults (application.js is always included). -<% if options[:skip_prototype] -%> +<% if options[:skip_javascript] -%> config.action_view.javascript_expansions[:defaults] = %w() +<% elsif options[:javascript] == 'jquery' -%> + config.action_view.javascript_expansions[:defaults] = %w(jquery rails) <% else -%> # config.action_view.javascript_expansions[:defaults] = %w(jquery rails) <% end -%> |