diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-06-28 06:02:01 -0700 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-06-28 06:02:01 -0700 |
| commit | 6b745ec9ee691b803cb701b1efa4e463d90ee01f (patch) | |
| tree | bb19e895c29222874cdba06a9cad30dae4553e2e /railties/lib/rails/generators/rails | |
| parent | 8f63515f6efbc5c342dc9af9aa936e72261a18fe (diff) | |
| parent | e68183cccbfbefab66c2e74855f5b30525f8e902 (diff) | |
| download | rails-6b745ec9ee691b803cb701b1efa4e463d90ee01f.tar.gz rails-6b745ec9ee691b803cb701b1efa4e463d90ee01f.tar.bz2 rails-6b745ec9ee691b803cb701b1efa4e463d90ee01f.zip | |
Merge pull request #11163 from nfedyashev/omit_turbolinks_on_javascript_skip_option
Omit turbolinks configuration completely on skip_javascript generator option
Diffstat (limited to 'railties/lib/rails/generators/rails')
| -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> |