Include the new Javascripts in new apps

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1523 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

2 files changed, 14 insertions, 11 deletions

diff --git a/railties/Rakefile b/railties/Rakefile
index 1c815e29b1..4f090dc889 100644
--- a/railties/Rakefile
+++ b/railties/Rakefile
@@ -25,7 +25,7 @@ PUBLIC_DIRS = %w( images javascripts stylesheets )
 TEST_DIRS   = %w( fixtures unit functional mocks mocks/development mocks/test )
 
 LOG_FILES    = %w( server.log development.log test.log production.log )
-HTML_FILES   = %w( 404.html 500.html index.html favicon.ico javascripts/prototype.js )
+HTML_FILES   = %w( 404.html 500.html index.html favicon.ico javascripts/prototype.js javascripts/effects.js javascripts/dragdrop.js javascripts/controls.js )
 BIN_FILES    = %w( generate destroy breakpointer console server update runner profiler benchmarker )
 
 VENDOR_LIBS = %w( actionpack activerecord actionmailer activesupport actionwebservice railties )
diff --git a/railties/lib/rails_generator/generators/applications/app/app_generator.rb b/railties/lib/rails_generator/generators/applications/app/app_generator.rb
index 5d0c2a7d98..facde24183 100644
--- a/railties/lib/rails_generator/generators/applications/app/app_generator.rb
+++ b/railties/lib/rails_generator/generators/applications/app/app_generator.rb
@@ -23,24 +23,24 @@ class AppGenerator < Rails::Generator::Base
 
       # Root
       m.file "fresh_rakefile", "Rakefile"
-      m.file "README", "README"
-      m.file "CHANGELOG", "CHANGELOG"
+      m.file "README",         "README"
+      m.file "CHANGELOG",      "CHANGELOG"
 
       # Application
-      m.template "helpers/application.rb", "app/controllers/application.rb"
+      m.template "helpers/application.rb",        "app/controllers/application.rb"
       m.template "helpers/application_helper.rb", "app/helpers/application_helper.rb"
-      m.template "helpers/test_helper.rb", "test/test_helper.rb"
+      m.template "helpers/test_helper.rb",        "test/test_helper.rb"
 
       # database.yml and .htaccess
       m.template "configs/database.yml", "config/database.yml"
-      m.template "configs/routes.rb", "config/routes.rb"
-      m.template "configs/apache.conf", "public/.htaccess"
+      m.template "configs/routes.rb",    "config/routes.rb"
+      m.template "configs/apache.conf",  "public/.htaccess"
 
       # Environments
       m.file "environments/environment.rb", "config/environment.rb"
-      m.file "environments/production.rb", "config/environments/production.rb"
+      m.file "environments/production.rb",  "config/environments/production.rb"
       m.file "environments/development.rb", "config/environments/development.rb"
-      m.file "environments/test.rb", "config/environments/test.rb"
+      m.file "environments/test.rb",        "config/environments/test.rb"
 
       # Scripts
       %w(console destroy generate server runner benchmarker profiler).each do |file|
@@ -53,8 +53,8 @@ class AppGenerator < Rails::Generator::Base
       end
 
       # Dispatches
-      m.file "dispatches/dispatch.rb", "public/dispatch.rb", script_options
-      m.file "dispatches/dispatch.rb", "public/dispatch.cgi", script_options
+      m.file "dispatches/dispatch.rb",   "public/dispatch.rb", script_options
+      m.file "dispatches/dispatch.rb",   "public/dispatch.cgi", script_options
       m.file "dispatches/dispatch.fcgi", "public/dispatch.fcgi", script_options
 
       # HTML files
@@ -66,6 +66,9 @@ class AppGenerator < Rails::Generator::Base
 
       # Javascripts
       m.file "html/javascripts/prototype.js", "public/javascripts/prototype.js"
+      m.file "html/javascripts/effects.js",   "public/javascripts/effects.js"
+      m.file "html/javascripts/dragdrop.js",  "public/javascripts/dragdrop.js"
+      m.file "html/javascripts/controls.js",  "public/javascripts/controls.js"
 
       # Docs
       m.file "doc/README_FOR_APP", "doc/README_FOR_APP"