diff options
| author | José Valim <jose.valim@gmail.com> | 2011-05-30 08:17:13 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-05-30 08:17:13 -0700 |
| commit | 65858a4bedab5f1ace32059f401d71602056fef0 (patch) | |
| tree | a6b1fe0816fa45c8995baacce1b2a64e2042a1ce /railties/lib | |
| parent | 862390542d280fd2796e5c0a81d533130a2974b4 (diff) | |
| parent | baf2a9cb7fde7c6e787765ed86289fda164075b1 (diff) | |
| download | rails-65858a4bedab5f1ace32059f401d71602056fef0.tar.gz rails-65858a4bedab5f1ace32059f401d71602056fef0.tar.bz2 rails-65858a4bedab5f1ace32059f401d71602056fef0.zip | |
Merge pull request #1404 from commuter/plugin_new_generator_should_properly_require_js
properly require javascript libraries when generating mountable engine
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/plugin_new/templates/Gemfile | 4 |
2 files changed, 5 insertions, 1 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 00f90f9498..11867a4cd7 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 @@ -118,7 +118,7 @@ task :default => :test return if options.skip_javascript? if mountable? - copy_file "#{app_templates_dir}/app/assets/javascripts/application.js.tt", + template "#{app_templates_dir}/app/assets/javascripts/application.js.tt", "app/assets/javascripts/application.js" elsif full? empty_directory_with_gitkeep "app/assets/javascripts" diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/Gemfile b/railties/lib/rails/generators/rails/plugin_new/templates/Gemfile index 29900c93dc..c28e568711 100644 --- a/railties/lib/rails/generators/rails/plugin_new/templates/Gemfile +++ b/railties/lib/rails/generators/rails/plugin_new/templates/Gemfile @@ -6,6 +6,10 @@ source "http://rubygems.org" <%= database_gemfile_entry -%> <% end -%> +<% if mountable? -%> +<%= gem_for_javascript -%> +<% end -%> + if RUBY_VERSION < '1.9' gem "ruby-debug", ">= 0.10.3" end |