feat: update google analytics to gtag.js, close kitian616#87

Ja50n · Aug 26, 2018 · 6f0e283 · 6f0e283
1 parent f9726f9
commit 6f0e283
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/_includes/analytics-providers/google.html b/_includes/analytics-providers/google.html
@@ -1,16 +1,14 @@
 {%- if site.analytics.google.tracking_id -%}
-
+	<!-- Global site tag (gtag.js) - Google Analytics -->
+	<script async src="https://www.googletagmanager.com/gtag/js?id={{ site.analytics.google.tracking_id }}"></script>
 	<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');
+		window.dataLayer = window.dataLayer || [];
+		function gtag(){dataLayer.push(arguments);}
+		gtag('js', new Date());
 
-		ga('create', '{{ site.analytics.google.tracking_id }}', 'auto');
-		ga('send', 'pageview');
+		gtag('config', '{{ site.analytics.google.tracking_id }}');
 		{% if site.analytics.google.anonymize_ip == true %}
-		ga('set', 'anonymizeIp', true);
+			gtag('config', '{{ site.analytics.google.tracking_id }}', { 'anonymize_ip': true });
 		{% endif %}
 	</script>
-
 {%- endif -%}
diff --git a/_layouts/base.html b/_layouts/base.html
@@ -5,6 +5,7 @@
 {%- include snippets/get-lang.html -%}
 <html lang="{{ __return }}">
   <head>
+    {%- include analytics.html -%}
     {%- include head.html -%}
     <script>
       {%- include scripts/utils.js -%}

diff --git a/_layouts/page.html b/_layouts/page.html
@@ -158,5 +158,4 @@
 
 
 {%- include markdown-enhancements.html -%}
-{%- include pageview.html -%}
-{%- include analytics.html -%}
+{%- include pageview.html -%}