diff options
| author | Noel Gomez <noel_gomez@yahoo.com> | 2011-05-30 12:58:21 -0700 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-05-31 22:45:31 +0200 |
| commit | 7b4cd4bb5bfd169404d501fde29fe237eeecebfa (patch) | |
| tree | bf6a795f66ad4c0828f767536a64bb4d0fd63ac3 /railties/lib/rails | |
| parent | 2183f0586457b5357185331bb790325d9a5a3fa7 (diff) | |
| download | rails-7b4cd4bb5bfd169404d501fde29fe237eeecebfa.tar.gz rails-7b4cd4bb5bfd169404d501fde29fe237eeecebfa.tar.bz2 rails-7b4cd4bb5bfd169404d501fde29fe237eeecebfa.zip | |
Modified generated text to explain where .js and .coffee files can be located and that there shouldn't be blank lines in manifest per this issue http://groups.google.com/group/rubyonrails-talk/browse_thread/thread/effb868290c2c0b8
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt | 8 |
1 files changed, 5 insertions, 3 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 19294b3478..80945a41b8 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,9 +1,11 @@ -// This is a manifest file that'll be compiled into including all the files listed below. -// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically -// be included in the compiled file accessible from http://example.com/assets/application.js +// This is a manifest file that'll be compiled into application.js and include all the files listed below. +// Add new JavaScript/Coffee code in separate files in; this directory, lib/assets/javascripts, or vendor/assets/javascripts +// and they'll be included in the compiled file accessible from http://example.com/assets/application.js // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the // the compiled file. // +// WARNING: DO NOT LEAVE ANY BLANK LINES BETWEEN REQUIRES BELOW +// <% unless options[:skip_javascript] -%> //= require <%= options[:javascript] %> //= require <%= options[:javascript] %>_ujs |