diff options
author | Nikita Fedyashev <nfedyashev@gmail.com> | 2013-06-28 17:11:50 +0600 |
---|---|---|
committer | Nikita Fedyashev <nfedyashev@gmail.com> | 2013-06-28 18:53:32 +0600 |
commit | e68183cccbfbefab66c2e74855f5b30525f8e902 (patch) | |
tree | b388abd8bbe0d68d3668cafb272bd87f48fb7e20 /railties/lib | |
parent | 569227b0914f4592fbee897d9c97f5f740dd2637 (diff) | |
download | rails-e68183cccbfbefab66c2e74855f5b30525f8e902.tar.gz rails-e68183cccbfbefab66c2e74855f5b30525f8e902.tar.bz2 rails-e68183cccbfbefab66c2e74855f5b30525f8e902.zip |
Omit turbolinks configuration completely on skip_javascript generator option
Diffstat (limited to 'railties/lib')
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt | 5 |
1 files changed, 5 insertions, 0 deletions
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 d87c7b7268..c3d1578818 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 @@ -2,8 +2,13 @@ <html> <head> <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 %> + <%- end -%> <%%= csrf_meta_tags %> </head> <body> |