diff options
| author | Xavier Noria <fxn@hashref.com> | 2011-05-31 22:20:31 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-05-31 22:45:31 +0200 |
| commit | daf4a4f747186bb0c5088bd803b45fd30ff55262 (patch) | |
| tree | f3cc7cc1565d74ebf85669265677c02ae43bc836 /railties/lib | |
| parent | 7b4cd4bb5bfd169404d501fde29fe237eeecebfa (diff) | |
| download | rails-daf4a4f747186bb0c5088bd803b45fd30ff55262.tar.gz rails-daf4a4f747186bb0c5088bd803b45fd30ff55262.tar.bz2 rails-daf4a4f747186bb0c5088bd803b45fd30ff55262.zip | |
revises commit from pull request 1409
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt | 12 |
1 files changed, 8 insertions, 4 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 80945a41b8..f33a7f4ac2 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,10 +1,14 @@ -// 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 +// This is a manifest file that'll be compiled into application.js, which will include all the files +// listed below. +// +// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts, +// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path. +// // 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 +// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD +// GO AFTER THE REQUIRES BELOW. // <% unless options[:skip_javascript] -%> //= require <%= options[:javascript] %> |