From f3f28ee493c72d69efd7c849c8a11fa699a459a5 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Wed, 13 Apr 2011 17:37:48 +0200 Subject: Dont need to make application.js into coffee since it will mostly be a manifest file anyway --- .../rails/app/templates/app/assets/javascripts/application.js | 6 ++++++ .../app/templates/app/assets/javascripts/application.js.coffee | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js delete mode 100644 railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.coffee (limited to 'railties/lib/rails') diff --git a/railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js b/railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js new file mode 100644 index 0000000000..488ac8cd80 --- /dev/null +++ b/railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js @@ -0,0 +1,6 @@ +# 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 jquery +#= require jquery_ujs +#= require_tree . diff --git a/railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.coffee b/railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.coffee deleted file mode 100644 index dd90dad1c1..0000000000 --- a/railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.coffee +++ /dev/null @@ -1,6 +0,0 @@ -# Place your application-specific JavaScript functions and classes here -# FIXME: Tell people how Sprockets and CoffeeScript works -# -#= require jquery -#= require jquery_ujs -#= require_tree . -- cgit v1.2.3