diff options
| -rw-r--r-- | railties/lib/rails/generators/rails/app/app_generator.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb index 552346facb..f2b527ac07 100644 --- a/railties/lib/rails/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -124,7 +124,7 @@ module Rails empty_directory_with_gitkeep "vendor/assets/javascripts" else copy_file "vendor/assets/javascripts/#{options[:javascript]}.js" - copy_file "vendor/assets/javascripts/#{options[:javascript]}_ujs.js", "vendor/assets/javascripts/rails.js" + copy_file "vendor/assets/javascripts/#{options[:javascript]}_ujs.js" if options[:javascript] == "prototype" copy_file "vendor/assets/javascripts/controls.js" diff --git a/railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt b/railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt new file mode 100644 index 0000000000..8b8ba74c01 --- /dev/null +++ b/railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt @@ -0,0 +1,11 @@ +# FIXME: Tell people that this is a manifest file, real code should go into discrete files +# FIXME: Tell people how Sprockets and CoffeeScript works +# +#= require <%= options[:javascript] %> +#= require <%= options[:javascript] %>_ujs +<% if options[:javascript] == "prototype" %> +#= require controls +#= require dragdrop +#= require effects +<% end -%> +#= require_tree . |