aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2012-04-25 18:21:21 +0530
committerVijay Dev <vijaydev.cse@gmail.com>2012-04-25 18:21:21 +0530
commit9e962ffd9adad16d7255fc1f37a9b3cfeecbaa9a (patch)
treee281759d8e5ab4380ecaf0cc4402a40987d507b7 /railties
parentdca1cd4a7a5cdd7a63968fafdc249c4e9cb9e594 (diff)
downloadrails-9e962ffd9adad16d7255fc1f37a9b3cfeecbaa9a.tar.gz
rails-9e962ffd9adad16d7255fc1f37a9b3cfeecbaa9a.tar.bz2
rails-9e962ffd9adad16d7255fc1f37a9b3cfeecbaa9a.zip
Revert "Added warning that require_tree includes files in unspecified order. So, that people may know the order of their scripts might be the reason that their scripts work in just fine in development but not in production. "
This reverts commit 9dbd511172170f60b96012b7b87044638c3962b8. Reason: Sounds like something for the guide, not the template.
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt9
1 files changed, 2 insertions, 7 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 040fe55220..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
@@ -2,10 +2,10 @@
// 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.
+// 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.
+// the compiled file.
//
// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
// GO AFTER THE REQUIRES BELOW.
@@ -14,9 +14,4 @@
//= require <%= options[:javascript] %>
//= require <%= options[:javascript] %>_ujs
<% end -%>
-//
-// require_tree includes all JavaScript/Coffee files present in asset path using an unspecified order.
-// this may cause some scripts to break.
-// To ensure some particular file ends up above some other in the final concatenated file, application.js
-// Simply, require that prerequisite file first in the manifest.
//= require_tree .