diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-10-27 11:53:04 -0700 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-10-27 11:53:04 -0700 |
| commit | 494b62826b6257f145cce9ebbd58a1d842486621 (patch) | |
| tree | fcaa2c71ff7d36f2d22dd58caf5a2bedf00f430a /railties/lib | |
| parent | b7ca9b52fe23f979ca5c60039faeac3d844e3ee3 (diff) | |
| parent | 84e261b9309d362a210ed55941f2852ec4230038 (diff) | |
| download | rails-494b62826b6257f145cce9ebbd58a1d842486621.tar.gz rails-494b62826b6257f145cce9ebbd58a1d842486621.tar.bz2 rails-494b62826b6257f145cce9ebbd58a1d842486621.zip | |
Merge pull request #12657 from robin850/skip-javascript
Removal of javascript related files when creating an app
Diffstat (limited to 'railties/lib')
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 28a1a0b0f5..6cb3eed873 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -206,13 +206,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 4e92f56b2d..6927cc52dd 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 @@ -226,6 +228,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 %> |