diff options
| author | Piotr Sarnacki <drogus@gmail.com> | 2010-12-15 12:56:29 +0100 |
|---|---|---|
| committer | Piotr Sarnacki <drogus@gmail.com> | 2010-12-15 13:04:06 +0100 |
| commit | 779a60dee553bda9a5238ac658d68f5022cf9810 (patch) | |
| tree | 2f313967cfee4bb5d885ae1da7f4ce3762b0a6c2 | |
| parent | 5d63a36ae8c2a839d0a197b10250184a035064e7 (diff) | |
| download | rails-779a60dee553bda9a5238ac658d68f5022cf9810.tar.gz rails-779a60dee553bda9a5238ac658d68f5022cf9810.tar.bz2 rails-779a60dee553bda9a5238ac658d68f5022cf9810.zip | |
Fix generation of prototype files, it should work with --javascript prototype, not --prototype
3 files changed, 5 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb index f833b5d041..d25372ea8e 100644 --- a/railties/lib/rails/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -109,7 +109,7 @@ module Rails copy_file "public/javascripts/#{@options[:javascript]}.js" copy_file "public/javascripts/#{@options[:javascript]}_ujs.js", "public/javascripts/rails.js" - if options[:prototype] + if options[:javascript] == "prototype" copy_file "public/javascripts/controls.js" copy_file "public/javascripts/dragdrop.js" copy_file "public/javascripts/effects.js" diff --git a/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb b/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb index 3cd4fa4ba1..47a84e228c 100644 --- a/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb +++ b/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb @@ -101,7 +101,7 @@ task :default => :test copy_file "#{app_templates_dir}/public/javascripts/#{options[:javascript]}.js", "public/javascripts/#{options[:javascript]}.js" copy_file "#{app_templates_dir}/public/javascripts/#{options[:javascript]}_ujs.js", "public/javascripts/rails.js" - if options[:prototype] + if options[:javascript] == "prototype" copy_file "#{app_templates_dir}/public/javascripts/controls.js", "public/javascripts/controls.js" copy_file "#{app_templates_dir}/public/javascripts/dragdrop.js", "public/javascripts/dragdrop.js" copy_file "#{app_templates_dir}/public/javascripts/effects.js", "public/javascripts/effects.js" diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 7faa674a81..02c49ab241 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -135,6 +135,9 @@ class AppGeneratorTest < Rails::Generators::TestCase assert_file "public/javascripts/application.js" assert_file "public/javascripts/prototype.js" assert_file "public/javascripts/rails.js" + assert_file "public/javascripts/controls.js" + assert_file "public/javascripts/dragdrop.js" + assert_file "public/javascripts/dragdrop.js" assert_file "test" end |