diff options
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt | 18 |
1 files changed, 9 insertions, 9 deletions
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 index 8b8ba74c01..fb5e91caf4 100644 --- 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 @@ -1,11 +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 +// 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 +//= require controls +//= require dragdrop +//= require effects <% end -%> -#= require_tree . +//= require_tree . |