diff options
| author | Robin Dupret <robin.dupret@gmail.com> | 2013-10-27 10:43:17 +0100 |
|---|---|---|
| committer | Robin Dupret <robin.dupret@gmail.com> | 2013-10-27 18:44:03 +0100 |
| commit | 84e261b9309d362a210ed55941f2852ec4230038 (patch) | |
| tree | d7316103b05cc716516adf3670e11404d0379a42 /railties/lib/rails | |
| parent | f230dbf6990fe4d2b7d33ef2caa3715a33bc0328 (diff) | |
| download | rails-84e261b9309d362a210ed55941f2852ec4230038.tar.gz rails-84e261b9309d362a210ed55941f2852ec4230038.tar.bz2 rails-84e261b9309d362a210ed55941f2852ec4230038.zip | |
Removal of javascript related gems when creating an app
Commit 0417bc8 add the coffee-rails and javascript runtime gems even
when passing the --skip-javascript option but this is not the desired
behavior.
Also remove all javascript related stuff in the generated application
such as the vendor/assets/javascripts folder.
Diffstat (limited to 'railties/lib/rails')
3 files changed, 9 insertions, 9 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index 6f1b7e2218..e65a0b1de0 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -207,13 +207,6 @@ module Rails gem 'uglifier', '>= 1.3.0' GEMFILE - if options[:skip_javascript] - gemfile += <<-GEMFILE - #{coffee_gemfile_entry} - #{javascript_runtime_gemfile_entry} - GEMFILE - end - gemfile.gsub(/^[ \t]+/, '') end diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb index db6b11abfa..095a165fc0 100644 --- a/railties/lib/rails/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -129,7 +129,9 @@ module Rails end def vendor_javascripts - empty_directory_with_keep_file 'vendor/assets/javascripts' + unless options[:skip_javascript] + empty_directory_with_keep_file 'vendor/assets/javascripts' + end end def vendor_stylesheets @@ -225,6 +227,12 @@ module Rails build(:leftovers) end + def delete_js_folder_skipping_javascript + if options[:skip_javascript] + remove_dir 'app/assets/javascripts' + end + end + public_task :apply_rails_template, :run_bundle protected diff --git a/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt b/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt index c3d1578818..4cf47bd0a0 100644 --- a/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt +++ b/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt @@ -4,7 +4,6 @@ <title><%= camelized %></title> <%- if options[:skip_javascript] -%> <%%= stylesheet_link_tag "application", media: "all" %> - <%%= javascript_include_tag "application" %> <%- else -%> <%%= stylesheet_link_tag "application", media: "all", "data-turbolinks-track" => true %> <%%= javascript_include_tag "application", "data-turbolinks-track" => true %> |