From 6fee628b13a544c10916972f370c45350974375d Mon Sep 17 00:00:00 2001
From: Jeffrey Tse <jeffreytse.mail@gmail.com>
Date: Sat, 14 Sep 2019 11:36:49 +0800
Subject: [PATCH] fix: correct google analytics

---
 _config.yml                                |  3 +++
 _includes/extensions/google-analytics.html | 25 ++++++++++++++--------
 _includes/head.html                        |  2 +-
 jekyll-theme-yat.gemspec                   |  2 +-
 4 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/_config.yml b/_config.yml
index e66c3a4..b8ce4a4 100644
--- a/_config.yml
+++ b/_config.yml
@@ -25,6 +25,9 @@ yat:
 # If you want more debug log, you can set true
 # debug: true
 
+# Google analytics
+# google_analytics: [Tracking ID]
+
 # Translate languges
 # langs refer to https://cloud.google.com/translate/docs/languages
 # translate_langs:
diff --git a/_includes/extensions/google-analytics.html b/_includes/extensions/google-analytics.html
index e9afb20..a73c860 100644
--- a/_includes/extensions/google-analytics.html
+++ b/_includes/extensions/google-analytics.html
@@ -1,12 +1,19 @@
 <script>
-if(!(window.doNotTrack === "1" || navigator.doNotTrack === "1" || navigator.doNotTrack === "yes" || navigator.msDoNotTrack === "1")) {
-  (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');
+  function initGoogleAnalytics() {
+    var doNotTrack = (window.doNotTrack === "1" || navigator.doNotTrack === "1" ||
+      navigator.doNotTrack === "yes" || navigator.msDoNotTrack === "1");
+    var enableDNT = "{{ site.enableDNT | default: true }}" == "true";
 
-  ga('create', '{{ site.google_analytics }}', 'auto');
-  ga('send', 'pageview');
-}
+    if (!enableDNT || !doNotTrack) {
+      (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', '{{ site.google_analytics }}', 'auto');
+      ga('send', 'pageview');
+    }
+  }
+  initGoogleAnalytics();
 </script>
-  
+
diff --git a/_includes/head.html b/_includes/head.html
index ec6ab58..03d16ba 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -11,6 +11,6 @@
   <link rel="stylesheet" href="{{ "/assets/main.css" | relative_url }}">
   {%- feed_meta -%}
   {%- if jekyll.environment == 'production' and site.google_analytics -%}
-    {%- include google-analytics.html -%}
+    {%- include extensions/google-analytics.html -%}
   {%- endif -%}
 </head>
diff --git a/jekyll-theme-yat.gemspec b/jekyll-theme-yat.gemspec
index 5fc7b08..8f3d8ea 100644
--- a/jekyll-theme-yat.gemspec
+++ b/jekyll-theme-yat.gemspec
@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "jekyll-theme-yat"
-  spec.version       = "1.0.0"
+  spec.version       = "1.0.1"
   spec.authors       = ["jeffreytse"]
   spec.email         = ["jeffreytse.mail@gmail.com"]