From f6a9b80e1339e8376ec123bcf368883c07a99f49 Mon Sep 17 00:00:00 2001
From: Viktor Zimmermann <viktor.zimmermann@gmail.com>
Date: Fri, 7 Jun 2019 18:23:46 +0200
Subject: [PATCH 1/4] Update google_tag_manager_head.erb

---
 .../google_tag_manager/template/google_tag_manager_head.erb    | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/rack/tracker/google_tag_manager/template/google_tag_manager_head.erb b/lib/rack/tracker/google_tag_manager/template/google_tag_manager_head.erb
index 3b059c0..0745dce 100644
--- a/lib/rack/tracker/google_tag_manager/template/google_tag_manager_head.erb
+++ b/lib/rack/tracker/google_tag_manager/template/google_tag_manager_head.erb
@@ -12,9 +12,6 @@
     <% if options[:turbolinks] %>
       document.addEventListener('turbolinks:load', function(event) {
         var url = event.data.url;
-        <% if events.any? %>
-          dataLayer.push(<%= events.map(&:write).join(', ') %>);
-        <% end %>
         dataLayer.push({'event':'pageView','virtualUrl': url});
       });
     <% end %>

From e7c9233698f1a9120f4950f2f2c69a74fe8edfde Mon Sep 17 00:00:00 2001
From: Viktor Zimmermann <viktor.zimmermann@gmail.com>
Date: Fri, 7 Jun 2019 18:25:19 +0200
Subject: [PATCH 2/4] Update google_tag_manager_body.erb

---
 .../google_tag_manager/template/google_tag_manager_body.erb   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/rack/tracker/google_tag_manager/template/google_tag_manager_body.erb b/lib/rack/tracker/google_tag_manager/template/google_tag_manager_body.erb
index cc30f77..fa1d82c 100644
--- a/lib/rack/tracker/google_tag_manager/template/google_tag_manager_body.erb
+++ b/lib/rack/tracker/google_tag_manager/template/google_tag_manager_body.erb
@@ -1,3 +1,7 @@
+<% if options[:turbolinks] && events.any? %>
+  dataLayer.push(<%= events.map(&:write).join(', ') %>);
+<% end %>
+
 <% if container %>
 <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=<%= container %>"
 height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>

From c58a2c7174c0d8581274f2e886e33eeb8611331c Mon Sep 17 00:00:00 2001
From: Viktor Zimmermann <viktor.zimmermann@gmail.com>
Date: Fri, 7 Jun 2019 18:42:49 +0200
Subject: [PATCH 3/4] Update google_tag_manager_body.erb

---
 .../template/google_tag_manager_body.erb            | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/rack/tracker/google_tag_manager/template/google_tag_manager_body.erb b/lib/rack/tracker/google_tag_manager/template/google_tag_manager_body.erb
index fa1d82c..6b40ed3 100644
--- a/lib/rack/tracker/google_tag_manager/template/google_tag_manager_body.erb
+++ b/lib/rack/tracker/google_tag_manager/template/google_tag_manager_body.erb
@@ -1,8 +1,9 @@
-<% if options[:turbolinks] && events.any? %>
-  dataLayer.push(<%= events.map(&:write).join(', ') %>);
-<% end %>
-
 <% if container %>
-<noscript><iframe src="https://www.googletagmanager.com/ns.html?id=<%= container %>"
-height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
+  <% if options[:turbolinks] && events.any? %>
+    <script>  
+      dataLayer.push(<%= events.map(&:write).join(', ') %>);
+    </script>
+  <% end %>
+  <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=<%= container %>"
+  height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
 <% end %>

From 5ae76e2ff93a7829e83d1998154ef4a5c84fcec1 Mon Sep 17 00:00:00 2001
From: Viktor Zimmermann <viktor.zimmermann@gmail.com>
Date: Fri, 7 Jun 2019 19:01:11 +0200
Subject: [PATCH 4/4] Update google_tag_manager_body.erb

---
 .../google_tag_manager/template/google_tag_manager_body.erb   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/rack/tracker/google_tag_manager/template/google_tag_manager_body.erb b/lib/rack/tracker/google_tag_manager/template/google_tag_manager_body.erb
index 6b40ed3..b33dedb 100644
--- a/lib/rack/tracker/google_tag_manager/template/google_tag_manager_body.erb
+++ b/lib/rack/tracker/google_tag_manager/template/google_tag_manager_body.erb
@@ -1,7 +1,9 @@
 <% if container %>
   <% if options[:turbolinks] && events.any? %>
     <script>  
-      dataLayer.push(<%= events.map(&:write).join(', ') %>);
+      document.addEventListener('turbolinks:load', function(event) {
+        dataLayer.push(<%= events.map(&:write).join(', ') %>);
+      });
     </script>
   <% end %>
   <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=<%= container %>"