From cfc36c28d2b2e236e0c33d18dbcaaa9adb27ce56 Mon Sep 17 00:00:00 2001
From: Myles Johnson <Myles.S.Johnson@gmail.com>
Date: Tue, 13 Jun 2017 02:10:35 -0600
Subject: [PATCH] Improve Google Analytics (#209)

* Move Google Analytics to the head
* Use async JS loading
* Add autotrack.js to replace custom JS for tracking events
---
 data/sri.toml                |  1 +
 layouts/partials/footer.html | 22 ----------------------
 layouts/partials/header.html | 17 +++++++++++++++++
 3 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/data/sri.toml b/data/sri.toml
index ccdcb961..1904fbd9 100644
--- a/data/sri.toml
+++ b/data/sri.toml
@@ -10,6 +10,7 @@
     bootstrap = "sha512-iztkobsvnjKfAtTNdHkGVjAYTrrtlC7mGp/54c40wowO7LhURYl3gVzzcEqGl/qKXQltJ2HwMrdLcNUdo+N/RQ=="
     isotope = "sha512-VDBOIlDbuC4VWxGJNmuFRQ0Li0SKkDpmGyuhAG5LTDLd/dJ/S0WMVxriR2Y+CyPL5gzjpN4f/6iqWVBJlht0tQ=="
     jQuery = "sha512-jGsMH83oKe9asCpkOVkBnUrDDTp8wl+adkB2D+//JtlxO4SrLoJdhbOysIFQJloQFD+C4Fl1rMsQZF76JjV0eQ=="
+    autotrack = "sha512-HUmooslVKj4m6OBu0OgzjXXr+QuFYy/k7eLI5jdeEy/F4RSgMn6XRWRGkFi5IFaFgy7uFTkegp3Z0XnJf3Jq+g=="
 
 [css]
     bootstrap = "sha512-6MXa8B6uaO18Hid6blRMetEIoPqHf7Ux1tnyIQdpt9qI5OACx7C+O3IVTr98vwGnlcg0LOLa02i9Y1HpVhlfiw=="
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index f2fac6e6..f7be44e3 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -18,28 +18,6 @@
     <script src="{{ "/js/" | relURL }}{{ . }}"></script>
     {{ end }}
 
-    {{ with .Site.GoogleAnalytics }}
-    <script>
-        (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-        (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-        })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-        ga('create', '{{ . }}', 'auto');
-        ga('send', 'pageview');
-
-        /* Send outbound link click events */
-        var links = document.querySelectorAll('a');
-        Array.prototype.map.call(links, function(item) {
-            if (item.host != document.location.host) {
-                item.addEventListener('click', function() {
-                    var action = item.getAttribute('data-action') || 'follow';
-                    ga('send', 'event', 'outbound', action, item.href);
-                });
-            }
-        });
-    </script>
-    {{ end }}
-
     <!-- Code highlighting -->
     {{ if $.Scratch.Get "highlight_enabled" }}
       {{ $v := .Site.Params.highlight_version | default "9.9.0" }}
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 14bb81cd..df6913f4 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -42,6 +42,23 @@
   <link rel="stylesheet" href="{{ "/css/" | relURL }}{{ . }}">
   {{ end }}
 
+  {{ if .Site.GoogleAnalytics }}
+    <script>
+      window.ga=window.ga||function(){(ga.q=ga.q||[]).push(arguments)};ga.l=+new Date;
+      ga('create', '{{ .Site.GoogleAnalytics }}', 'auto');
+      ga('require', 'eventTracker');
+      ga('require', 'outboundLinkTracker');
+      ga('require', 'urlChangeTracker');
+      ga('send', 'pageview');
+    </script>
+    <script async src="//www.google-analytics.com/analytics.js"></script>
+    {{ if not .Site.Params.disable_sri }}
+    {{ printf "<script async src=\"https://cdnjs.cloudflare.com/ajax/libs/autotrack/2.4.1/autotrack.js\" integrity=\"%s\" crossorigin=\"anonymous\"></script>" .Site.Data.sri.js.autotrack | safeHTML }}
+    {{ else }}
+    <script async src="//cdnjs.cloudflare.com/ajax/libs/autotrack/2.4.1/autotrack.js"></script>
+    {{ end }}
+  {{ end }}
+
   <link rel="alternate" href="{{ .RSSLink | default .Site.RSSLink  }}" type="application/rss+xml" title="{{ .Site.Title }}">
   <link rel="feed" href="{{ .RSSLink | default .Site.RSSLink }}" type="application/rss+xml" title="{{ .Site.Title }}">