From 1b45a24113bf6a27121d4812da0bb3ed9fc6e2c3 Mon Sep 17 00:00:00 2001
From: squidfunk <martin.donath@squidfunk.com>
Date: Tue, 12 Feb 2019 18:11:40 +0100
Subject: [PATCH] Fixed loading method for Google Analytics

---
 CHANGELOG                                     |  1 +
 material/partials/integrations/analytics.html | 20 ++++++++++---------
 src/partials/integrations/analytics.html      | 20 ++++++++++---------
 3 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 7758d9290..357b065be 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 mkdocs-material-3.x.x (2019-xx-xx)
 
   * Removed Google Tag Manager and reverted to Google Analytics
+  * Removed blocks in partials - Jinja doesn't support them
 
 mkdocs-material-3.3.0 (2019-01-29)
 
diff --git a/material/partials/integrations/analytics.html b/material/partials/integrations/analytics.html
index 73329f152..8d1b2e36a 100644
--- a/material/partials/integrations/analytics.html
+++ b/material/partials/integrations/analytics.html
@@ -1,22 +1,24 @@
 {% set analytics = config.google_analytics %}
 <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.ga = window.ga || function() {
+    (ga.q = ga.q || []).push(arguments)
+  }
+  ga.l = +new Date
   /* Setup integration and send page view */
-  ga("create", "{{ analytics[0] }}", "{{ analytics[1] }}");
-  ga("send", "pageview");
+  ga("create", "{{ analytics[0] }}", "{{ analytics[1] }}")
+  ga("set", "anonymizeIp", true)
+  ga("send", "pageview")
   /* Register handler to log search on blur */
   document.addEventListener("DOMContentLoaded", () => {
     if (document.forms.search) {
-      var query = document.forms.search.query;
+      var query = document.forms.search.query
       query.addEventListener("blur", function() {
         if (this.value) {
           var path = document.location.pathname;
-          ga("send", "pageview", path + "?q=" + this.value);
+          ga("send", "pageview", path + "?q=" + this.value)
         }
-      });
+      })
     }
   })
 </script>
+<script async src="https://www.google-analytics.com/analytics.js"></script>
diff --git a/src/partials/integrations/analytics.html b/src/partials/integrations/analytics.html
index 3eb6856fc..2e82f2d6d 100644
--- a/src/partials/integrations/analytics.html
+++ b/src/partials/integrations/analytics.html
@@ -23,25 +23,27 @@
 <!-- Google Analytics integration -->
 {% set analytics = config.google_analytics %}
 <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.ga = window.ga || function() {
+    (ga.q = ga.q || []).push(arguments)
+  }
+  ga.l = +new Date
 
   /* Setup integration and send page view */
-  ga("create", "{{ analytics[0] }}", "{{ analytics[1] }}");
-  ga("send", "pageview");
+  ga("create", "{{ analytics[0] }}", "{{ analytics[1] }}")
+  ga("set", "anonymizeIp", true)
+  ga("send", "pageview")
 
   /* Register handler to log search on blur */
   document.addEventListener("DOMContentLoaded", () => {
     if (document.forms.search) {
-      var query = document.forms.search.query;
+      var query = document.forms.search.query
       query.addEventListener("blur", function() {
         if (this.value) {
           var path = document.location.pathname;
-          ga("send", "pageview", path + "?q=" + this.value);
+          ga("send", "pageview", path + "?q=" + this.value)
         }
-      });
+      })
     }
   })
 </script>
+<script async src="https://www.google-analytics.com/analytics.js"></script>