DGNum/demarches-normaliennes
14
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge pull request #574 from sgmap/fix_turbolinks_in_new_design

Browse source 
Fix turbolinks in new design
This commit is contained in:
LeSim 2017-07-11 10:26:32 +02:00 committed by GitHub
commit fa4ade0872
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/layouts/_mailjet_newsletter.html.haml
View file

@ -1,2 +1,2 @@
%data.mj-w-data{ "data-apikey" => "1v5T", "data-base" => "https://app.mailjet.com", "data-height" => "328", "data-lang" => "fr_FR", "data-statics" => "statics", "data-token" => "11c89e7ddb46fbcdcb7f8fe5fdfca818", "data-w-id" => "39b", "data-width" => "640" } %data.mj-w-data{ "data-apikey" => "1v5T", "data-base" => "https://app.mailjet.com", "data-height" => "328", "data-lang" => "fr_FR", "data-statics" => "statics", "data-token" => "11c89e7ddb46fbcdcb7f8fe5fdfca818", "data-w-id" => "39b", "data-width" => "640" }
%script{ src: 'https://app.mailjet.com/statics/js/widget.modal.js' } %script{ src: 'https://app.mailjet.com/statics/js/widget.modal.js', 'data-turbolinks-eval': 'false' }

2
app/views/layouts/new_application.html.haml
View file

@ -35,7 +35,7 @@
= render partial: "layouts/mailjet_newsletter" = render partial: "layouts/mailjet_newsletter"
= render partial: "layouts/crisp" = render partial: "layouts/crisp"
= javascript_include_tag "new_design/application", "data-turbolinks-track": true = javascript_include_tag "new_design/application", "data-turbolinks-eval": false
= yield :charts_js = yield :charts_js
- if Rails.env == "test" - if Rails.env == "test"
%script{ type: "text/javascript" } %script{ type: "text/javascript" }