diff options
Diffstat (limited to 'railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb')
| -rw-r--r-- | railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb | 17 |
1 files changed, 4 insertions, 13 deletions
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 126aadb88d..2bfe8b09f3 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 @@ -119,19 +119,10 @@ task :default => :test if mountable? copy_file "#{app_templates_dir}/app/assets/javascripts/application.js.tt", "app/assets/javascripts/application.js" - copy_file "#{app_templates_dir}/vendor/assets/javascripts/#{options[:javascript]}.js", - "vendor/assets/javascripts/#{options[:javascript]}.js" - copy_file "#{app_templates_dir}/vendor/assets/javascripts/#{options[:javascript]}_ujs.js", - "vendor/assets/javascripts/#{options[:javascript]}_ujs.js" - - if options[:javascript] == "prototype" - copy_file "#{app_templates_dir}/vendor/assets/javascripts/controls.js", - "vendor/assets/javascripts/controls.js" - copy_file "#{app_templates_dir}/vendor/assets/javascripts/dragdrop.js", - "vendor/assets/javascripts/dragdrop.js" - copy_file "#{app_templates_dir}/vendor/assets/javascripts/effects.js", - "vendor/assets/javascripts/effects.js" - end + copy_file "#{app_templates_dir}/vendor/assets/javascripts/jquery.js", + "vendor/assets/javascripts/jquery.js" + copy_file "#{app_templates_dir}/vendor/assets/javascripts/jquery_ujs.js", + "vendor/assets/javascripts/jquery_ujs.js" elsif full? empty_directory_with_gitkeep "app/assets/javascripts" end |