diff options
| -rw-r--r-- | railties/lib/generator/generators/app.thor | 6 | ||||
| -rw-r--r-- | railties/lib/generator/templates/app/javascripts/prototype/application.js (renamed from railties/lib/generator/templates/app/prototype/application.js) | 0 | ||||
| -rw-r--r-- | railties/lib/generator/templates/app/javascripts/prototype/controls.js (renamed from railties/lib/generator/templates/app/prototype/controls.js) | 0 | ||||
| -rw-r--r-- | railties/lib/generator/templates/app/javascripts/prototype/dragdrop.js (renamed from railties/lib/generator/templates/app/prototype/dragdrop.js) | 0 | ||||
| -rw-r--r-- | railties/lib/generator/templates/app/javascripts/prototype/effects.js (renamed from railties/lib/generator/templates/app/prototype/effects.js) | 0 | ||||
| -rw-r--r-- | railties/lib/generator/templates/app/javascripts/prototype/prototype.js (renamed from railties/lib/generator/templates/app/prototype/prototype.js) | 0 |
6 files changed, 2 insertions, 4 deletions
diff --git a/railties/lib/generator/generators/app.thor b/railties/lib/generator/generators/app.thor index e2b62729b4..8dc94641b3 100644 --- a/railties/lib/generator/generators/app.thor +++ b/railties/lib/generator/generators/app.thor @@ -23,7 +23,7 @@ class App < Thor::Group :desc => "Preconfigure for selected database (options: #{DATABASES.join('/')})" class_option :with_dispatchers, :type => :boolean, :aliases => "-D", :default => false, - :desc => "Add CGI/FastCGI/mod_ruby dispatches code" + :desc => "Add CGI/FastCGI/mod_ruby dispatchers code" class_option :freeze, :type => :boolean, :aliases => "-f", :default => false, :desc => "Freeze Rails in vendor/rails from the gems" @@ -108,9 +108,7 @@ class App < Thor::Group end def create_javascript_files - %w( prototype effects dragdrop controls application ).each do |javascript| - copy_file "prototype/#{javascript}.js", "public/javascripts/#{javascript}.js" - end + directory "javascripts/prototype", "public/javascripts" end def create_script_files diff --git a/railties/lib/generator/templates/app/prototype/application.js b/railties/lib/generator/templates/app/javascripts/prototype/application.js index fe4577696b..fe4577696b 100644 --- a/railties/lib/generator/templates/app/prototype/application.js +++ b/railties/lib/generator/templates/app/javascripts/prototype/application.js diff --git a/railties/lib/generator/templates/app/prototype/controls.js b/railties/lib/generator/templates/app/javascripts/prototype/controls.js index ca29aefdd1..ca29aefdd1 100644 --- a/railties/lib/generator/templates/app/prototype/controls.js +++ b/railties/lib/generator/templates/app/javascripts/prototype/controls.js diff --git a/railties/lib/generator/templates/app/prototype/dragdrop.js b/railties/lib/generator/templates/app/javascripts/prototype/dragdrop.js index 07229f986f..07229f986f 100644 --- a/railties/lib/generator/templates/app/prototype/dragdrop.js +++ b/railties/lib/generator/templates/app/javascripts/prototype/dragdrop.js diff --git a/railties/lib/generator/templates/app/prototype/effects.js b/railties/lib/generator/templates/app/javascripts/prototype/effects.js index 5a639d2dea..5a639d2dea 100644 --- a/railties/lib/generator/templates/app/prototype/effects.js +++ b/railties/lib/generator/templates/app/javascripts/prototype/effects.js diff --git a/railties/lib/generator/templates/app/prototype/prototype.js b/railties/lib/generator/templates/app/javascripts/prototype/prototype.js index dfe8ab4e13..dfe8ab4e13 100644 --- a/railties/lib/generator/templates/app/prototype/prototype.js +++ b/railties/lib/generator/templates/app/javascripts/prototype/prototype.js |