From c8ef0514f8db4b744d7781306e9c1950f319c91e Mon Sep 17 00:00:00 2001
From: Tunghsiao Liu <t@sparanoid.com>
Date: Fri, 24 Nov 2017 21:24:11 +0800
Subject: [PATCH] feat: use google analytics gtag script

---
 _app/_includes/amsf/google_analytics | 12 +++++-------
 _config.yml                          |  2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/_app/_includes/amsf/google_analytics b/_app/_includes/amsf/google_analytics
index c2c2e89cd..edd2d895f 100644
--- a/_app/_includes/amsf/google_analytics
+++ b/_app/_includes/amsf/google_analytics
@@ -3,14 +3,12 @@
 {% endcomment %}
 {% capture amsf_google_analytics %}
   {% if site.google_analytics.enabled %}
+    <script async src="{{ site.google_analytics.url }}?id={{ site.google_analytics.id }}"></script>
     <script>
-      (function(a,m,s,f,j,k,l){a['GoogleAnalyticsObject']=j;a[j]=a[j]||function(){
-      (a[j].q=a[j].q||[]).push(arguments)},a[j].l=1*new Date();k=m.createElement(s),
-      l=m.getElementsByTagName(s)[0];k.async=1;k.src=f;l.parentNode.insertBefore(k,l)
-      })(window,document,'script','{{ site.google_analytics.url }}','ga');
-
-      ga('create', '{{ site.google_analytics.id }}', 'auto');
-      ga('send', 'pageview');
+      window.dataLayer = window.dataLayer || [];
+      function gtag(){dataLayer.push(arguments);}
+      gtag('js', new Date());
+      gtag('config', '{{ site.google_analytics.id }}');
     </script>
   {% endif %}
 {% endcapture %}
diff --git a/_config.yml b/_config.yml
index 218ccfaaf..f6226667c 100644
--- a/_config.yml
+++ b/_config.yml
@@ -168,7 +168,7 @@ service_worker:
 google_analytics:
   enabled:      false
   id:           UA-xxxxxxx
-  url:          //www.google-analytics.com/analytics.js
+  url:          https://www.googletagmanager.com/gtag/js
 
 # Site Twitter account handle
 twitter:        sparanoid